diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java index 4023c2fe..24199c06 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java @@ -34,6 +34,24 @@ public interface IDepartmentUserBaseService { */ List listUserId(List departmentIds); + /** + * 用户ID列表 + * + * @param departmentId 部门ID + * @param userIds 用户ID列表 + * @return + */ + List listUserId(String departmentId, List userIds); + + /** + * 用户ID列表 + * + * @param departmentIds 部门ID列表 + * @param userIds 用户ID列表 + * @return + */ + List listUserId(List departmentIds, List userIds); + /** * 用户列表 * diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionUserBaseService.java index 15b462bd..897ae40e 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionUserBaseService.java @@ -51,4 +51,12 @@ public interface IPositionUserBaseService { * @return */ List listPositionPOByUserId(String userId); + + /** + * 职位列表 + * + * @param userIds + * @return + */ + List listPositionPOByUserIds(List userIds); } diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentUserDTO.java b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentUserDTO.java index 9126f986..cb681ab9 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentUserDTO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentUserDTO.java @@ -27,8 +27,7 @@ public class DepartmentUserDTO implements Serializable { private String departmentName; private String userSort; - public DepartmentUserDTO() { - } + public DepartmentUserDTO() {} public DepartmentUserDTO(UserDTO userDTO) { this.userId = userDTO.getUserId(); diff --git a/module-article/src/main/java/ink/wgink/module/article/service/content/IContentService.java b/module-article/src/main/java/ink/wgink/module/article/service/content/IContentService.java index 7b729a93..a0d867e7 100644 --- a/module-article/src/main/java/ink/wgink/module/article/service/content/IContentService.java +++ b/module-article/src/main/java/ink/wgink/module/article/service/content/IContentService.java @@ -33,7 +33,24 @@ public interface IContentService extends IArticleCheckService { * @param contentVO * @return */ - void saveByToken(String token, ContentVO contentVO); + void save(String token, ContentVO contentVO); + + /** + * 新增文章内容返回ID + * + * @param contentVO + * @return + */ + String saveReturnId(ContentVO contentVO); + + /** + * 新增文章内容返回ID + * + * @param token + * @param contentVO + * @return + */ + String saveReturnId(String token, ContentVO contentVO); /** * 删除文章内容 @@ -98,6 +115,48 @@ public interface IContentService extends IArticleCheckService { */ List list(Map params); + /** + * 文章内容列表 + * + * @param categoryId 目录ID + * @return + */ + List list(String categoryId); + + /** + * 文章列表 + * + * @param userId 用户ID + * @return + */ + List listByUserId(String userId); + + /** + * 文章列表 + * + * @param userIds 用户ID列表 + * @return + */ + List listByUserIds(List userIds); + + /** + * 文章列表 + * + * @param categoryId 目录ID + * @param userId 用户ID + * @return + */ + List listByUserId(String categoryId, String userId); + + /** + * 文章列表 + * + * @param categoryId 目录ID + * @param userIds 用户ID列表 + * @return + */ + List listByUserIds(String categoryId, List userIds); + /** * 文章内容分页列表 * @@ -106,6 +165,59 @@ public interface IContentService extends IArticleCheckService { */ SuccessResultList> listPage(ListPage page); + /** + * 文章内容分页 + * + * @param categoryId + * @param page + * @return + */ + SuccessResultList> listPage(String categoryId, ListPage page); + + /** + * 文章内容分页 + * + * @param categoryId + * @param userId + * @param page + * @return + */ + SuccessResultList> listPageByUserId(String categoryId, String userId, ListPage page); + + /** + * 文章内容分页 + * + * @param categoryId + * @param userIds + * @param page + * @return + */ + SuccessResultList> listPageByUserIds(String categoryId, List userIds, ListPage page); + + /** + * 文章内容列表（带数据权限） + * + * @param params + * @return + */ + List listWithDataAuth(Map params); + + /** + * 文章内容列表（带数据权限） + * + * @param categoryId 目录ID + * @return + */ + List listWithDataAuth(String categoryId); + + /** + * 文章内容分页列表（带数据权限） + * + * @param page + * @return + */ + SuccessResultList> listPageWithDataAuth(ListPage page); + /** * 统计文章数量 * diff --git a/module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentServiceImpl.java b/module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentServiceImpl.java index 0a94f47f..f514f71c 100644 --- a/module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentServiceImpl.java +++ b/module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentServiceImpl.java @@ -32,30 +32,31 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe @Override public void save(ContentVO contentVO) { - saveInfo(null, contentVO); + saveReturnId(null, contentVO); } @Override - public void saveByToken(String token, ContentVO contentVO) { - saveInfo(token, contentVO); + public void save(String token, ContentVO contentVO) { + saveReturnId(token, contentVO); } - /** - * 新增文章内容 - * - * @param token - * @param contentVO - * @throws Exception - */ - private void saveInfo(String token, ContentVO contentVO) { + @Override + public String saveReturnId(ContentVO contentVO) { + return saveReturnId(null, contentVO); + } + + @Override + public String saveReturnId(String token, ContentVO contentVO) { + String contentId = UUIDUtil.getUUID(); Map params = HashMapUtil.beanToMap(contentVO); - params.put("contentId", UUIDUtil.getUUID()); + params.put("contentId", contentId); if (token != null) { setAppSaveInfo(token, params); } else { setSaveInfo(params); } contentDao.save(params); + return contentId; } @Override @@ -134,6 +135,43 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe return contentDao.list(params); } + @Override + public List list(String categoryId) { + Map params = getHashMap(2); + params.put("categoryId", categoryId); + return list(params); + } + + @Override + public List listByUserId(String userId) { + Map params = getHashMap(2); + params.put("creator", userId); + return list(params); + } + + @Override + public List listByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("creators", userIds); + return list(params); + } + + @Override + public List listByUserId(String categoryId, String userId) { + Map params = getHashMap(4); + params.put("categoryId", categoryId); + params.put("creator", userId); + return list(params); + } + + @Override + public List listByUserIds(String categoryId, List userIds) { + Map params = getHashMap(4); + params.put("categoryId", categoryId); + params.put("creators", userIds); + return list(params); + } + @Override public SuccessResultList> listPage(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); @@ -142,6 +180,49 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPage(String categoryId, ListPage page) { + page.getParams().put("categoryId", categoryId); + return listPage(page); + } + + @Override + public SuccessResultList> listPageByUserId(String categoryId, String userId, ListPage page) { + page.getParams().put("categoryId", categoryId); + page.getParams().put("creator", userId); + return listPage(page); + } + + @Override + public SuccessResultList> listPageByUserIds(String categoryId, List userIds, ListPage page) { + page.getParams().put("categoryId", categoryId); + page.getParams().put("creators", userIds); + return listPage(page); + } + + @Override + public List listWithDataAuth(Map params) { + setDataAuthorityInfo(params); + return list(params); + } + + @Override + public List listWithDataAuth(String categoryId) { + Map params = getHashMap(16); + params.put("categoryId", categoryId); + setDataAuthorityInfo(params); + return list(params); + } + + @Override + public SuccessResultList> listPageWithDataAuth(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + List articleContentDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(articleContentDTOs); + return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + @Override public Integer count(Map params) { Integer count = contentDao.count(params); diff --git a/module-article/src/main/resources/mybatis/mapper/content/content-mapper.xml b/module-article/src/main/resources/mybatis/mapper/content/content-mapper.xml index 6478cfe0..e45b598f 100644 --- a/module-article/src/main/resources/mybatis/mapper/content/content-mapper.xml +++ b/module-article/src/main/resources/mybatis/mapper/content/content-mapper.xml @@ -238,13 +238,28 @@ t1.creator = #{creator} - AND + AND t1.creator IN #{creators[${index}]} - ORDER BY t1.publish_date DESC, t1.gmt_create DESC + + + + AND + t1.creator = #{data_creator} + + + AND + t1.creator IN + + #{data_creators[${index}]} + + + + + ORDER BY t1.publish_date DESC diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java index 1fa3df8a..b8a9087b 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java @@ -8,6 +8,7 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.vos.IdsVO; +import ink.wgink.service.department.pojo.vos.DepartmentUserSortVO; import ink.wgink.service.department.service.IDepartmentUserService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +48,18 @@ public class DepartmentUserController extends DefaultBaseController { return new SuccessResult(); } + @ApiOperation(value = "更新组织部门用户排序", notes = "更新组织部门用户排序接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-sort/{departmentId}") + public SuccessResult updateSort(@PathVariable("departmentId") String departmentId, + @RequestBody DepartmentUserSortVO departmentUserSortVO) { + departmentUserService.updateSort(departmentId, departmentUserSortVO); + return new SuccessResult(); + } + @ApiOperation(value = "组织部门用户删除", notes = "组织部门用户删除接口") @ApiImplicitParams({ @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), diff --git a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java index 8385db2c..eafb67c5 100644 --- a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java +++ b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java @@ -45,6 +45,14 @@ public interface IDepartmentUserDao { */ void delete(Map params) throws RemoveException; + /** + * 更新组织用户排序 + * + * @param params + * @throws UpdateException + */ + void updateSort(Map params) throws UpdateException; + /** * 用户ID列表 * @@ -70,4 +78,5 @@ public interface IDepartmentUserDao { * @throws SearchException */ List listDepartmentId(Map params) throws SearchException; + } diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentUserSortVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentUserSortVO.java new file mode 100644 index 00000000..2a0b55f7 --- /dev/null +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentUserSortVO.java @@ -0,0 +1,41 @@ +package ink.wgink.service.department.pojo.vos; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: DepartmentUserSortVO + * @Description: 部门用户排序 + * @Author: wanggeng + * @Date: 2021/6/10 3:55 下午 + * @Version: 1.0 + */ +@ApiModel +public class DepartmentUserSortVO { + @ApiModelProperty(name = "userId", value = "用户ID") + @CheckEmptyAnnotation(name = "用户ID") + private String userId; + @ApiModelProperty(name = "userSort", value = "用户排序") + @CheckEmptyAnnotation(name = "用户排序") + private String userSort; + + public String getUserId() { + return userId == null ? "" : userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserSort() { + return userSort == null ? "" : userSort; + } + + public void setUserSort(String userSort) { + this.userSort = userSort; + } +} diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java index be54e360..ee62883c 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java @@ -2,6 +2,7 @@ package ink.wgink.service.department.service; import ink.wgink.interfaces.department.IDepartmentUserBaseService; import ink.wgink.pojo.pos.DepartmentPO; +import ink.wgink.service.department.pojo.vos.DepartmentUserSortVO; import java.util.List; @@ -59,6 +60,14 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService { */ void update(String departmentId, List userIds); + /** + * 更新用户排序 + * + * @param departmentId + * @param departmentUserSortVO + */ + void updateSort(String departmentId, DepartmentUserSortVO departmentUserSortVO); + /** * 部门列表 * @@ -66,4 +75,5 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService { * @return */ List listDepartmentPOByUserId(String userId); + } diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index 6e0505aa..4599317d 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -10,6 +10,7 @@ import ink.wgink.pojo.dtos.department.DepartmentUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.service.department.dao.IDepartmentUserDao; +import ink.wgink.service.department.pojo.vos.DepartmentUserSortVO; import ink.wgink.service.department.service.IDepartmentAdjustmentService; import ink.wgink.service.department.service.IDepartmentService; import ink.wgink.service.department.service.IDepartmentUserService; @@ -113,6 +114,15 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe departmentAdjustmentService.save(newUserIds, departmentId, departmentPO.getDepartmentName(), USER_DEPARTMENT_TYPE_JOIN); } + @Override + public void updateSort(String departmentId, DepartmentUserSortVO departmentUserSortVO) { + Map params = getHashMap(6); + params.put("departmentId", departmentId); + params.put("userId", departmentUserSortVO.getUserId()); + params.put("userSort", departmentUserSortVO.getUserSort()); + departmentUserDao.updateSort(params); + } + @Override public List listDepartmentPOByUserId(String userId) { Map params = getHashMap(2); @@ -138,6 +148,22 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe return departmentUserDao.listUserId(params); } + @Override + public List listUserId(String departmentId, List userIds) { + Map params = getHashMap(4); + params.put("departmentId", departmentId); + params.put("userIds", userIds); + return departmentUserDao.listUserId(params); + } + + @Override + public List listUserId(List departmentIds, List userIds) { + Map params = getHashMap(4); + params.put("departmentIds", departmentIds); + params.put("userIds", userIds); + return departmentUserDao.listUserId(params); + } + @Override public SuccessResultList> listPage(String departmentId, ListPage page) { SuccessResultList> successResultList; diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml index 38412514..9bfc437e 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -100,7 +100,7 @@ `department_name` varchar(255) DEFAULT NULL COMMENT '机构名称', `department_name_en` varchar(255) DEFAULT NULL COMMENT '部门名称(英文)', `department_name_other` varchar(255) DEFAULT NULL COMMENT '部门名称(其他)', - `department_summary` varchar(255) DEFAULT NULL COMMENT '部门简介', + `department_summary` text COMMENT '部门简介', `department_code` varchar(255) DEFAULT NULL COMMENT '部门编码', `department_logo` char(36) DEFAULT NULL COMMENT '部门logo', `department_logo_hover` char(36) DEFAULT NULL COMMENT '部门logo:hover', diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml index 761c2677..bb70fe67 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml @@ -32,49 +32,73 @@ DELETE FROM sys_department_user - where - 1 = 1 - + + AND department_id = #{departmentId} - - + + AND department_id IN - + #{departmentIds[${index}]} - - - + + + AND user_id = #{userId} - - + + AND user_id IN - + #{userIds[${index}]} - - + + + + + + UPDATE + sys_department_user + SET + user_sort = #{userSort} + WHERE + department_id = #{departmentId} + AND + user_sort = #{userSort} + + diff --git a/service-department/src/main/resources/templates/department/save-merge.html b/service-department/src/main/resources/templates/department/save-merge.html index d65dbed3..8eba97c3 100644 --- a/service-department/src/main/resources/templates/department/save-merge.html +++ b/service-department/src/main/resources/templates/department/save-merge.html @@ -46,16 +46,6 @@ -
-
- -
- -
-
-
- -
@@ -67,6 +57,18 @@
+ +
+
+
+ +
+ +
+
+
+
+
@@ -79,8 +81,6 @@
- -
@@ -90,6 +90,8 @@
+ +
@@ -98,8 +100,6 @@
- -
@@ -108,6 +108,8 @@
+ +
@@ -116,8 +118,6 @@
- -
@@ -126,6 +126,8 @@
+ +
@@ -140,8 +142,6 @@
-
-
@@ -156,6 +156,8 @@
+
+
@@ -170,8 +172,6 @@
-
-
@@ -186,6 +186,8 @@
+
+
@@ -200,9 +202,7 @@
-
-
-
+
diff --git a/service-department/src/main/resources/templates/department/save-split.html b/service-department/src/main/resources/templates/department/save-split.html index 7aae367e..7208f4cd 100644 --- a/service-department/src/main/resources/templates/department/save-split.html +++ b/service-department/src/main/resources/templates/department/save-split.html @@ -52,16 +52,6 @@
-
-
- -
- -
-
-
-
-
@@ -73,6 +63,18 @@
+
+
+
+
+ +
+ +
+
+
+
+
@@ -85,8 +87,6 @@
- -
@@ -96,6 +96,8 @@
+ +
@@ -104,8 +106,6 @@
- -
@@ -114,6 +114,8 @@
+ +
@@ -122,8 +124,6 @@
- -
@@ -132,6 +132,8 @@
+ +
@@ -146,8 +148,6 @@
-
-
@@ -162,6 +162,8 @@
+
+
@@ -176,8 +178,6 @@
-
-
@@ -192,6 +192,8 @@
+
+
@@ -206,9 +208,7 @@
-
-
-
+
diff --git a/service-department/src/main/resources/templates/department/save.html b/service-department/src/main/resources/templates/department/save.html index 41483d12..38298e89 100644 --- a/service-department/src/main/resources/templates/department/save.html +++ b/service-department/src/main/resources/templates/department/save.html @@ -63,14 +63,16 @@
-
-
+
+
- +
+
+
@@ -81,21 +83,21 @@
-
-
-
-
-
- -
- +
+
+ +
+ +
+
+
@@ -105,8 +107,6 @@
-
-
@@ -115,6 +115,8 @@
+
+
@@ -123,8 +125,6 @@
-
-
@@ -133,6 +133,8 @@
+
+
@@ -141,8 +143,6 @@
-
-
@@ -157,6 +157,8 @@
+
+
@@ -171,8 +173,6 @@
-
-
@@ -187,6 +187,8 @@
+
+
@@ -201,8 +203,6 @@
-
-
@@ -217,7 +217,9 @@
-
+
+
+
diff --git a/service-department/src/main/resources/templates/department/update-split.html b/service-department/src/main/resources/templates/department/update-split.html index af2e5571..9ab26a45 100644 --- a/service-department/src/main/resources/templates/department/update-split.html +++ b/service-department/src/main/resources/templates/department/update-split.html @@ -52,16 +52,6 @@
-
-
- -
- -
-
-
-
-
@@ -73,6 +63,18 @@
+
+
+
+
+ +
+ +
+
+
+
+
@@ -85,8 +87,6 @@
-
-
@@ -96,6 +96,8 @@
+ +
@@ -104,8 +106,6 @@
- -
@@ -114,6 +114,8 @@
+ +
@@ -122,8 +124,6 @@
- -
@@ -132,6 +132,8 @@
+ +
@@ -146,8 +148,6 @@
-
-
@@ -162,6 +162,8 @@
+
+
@@ -176,8 +178,6 @@
-
-
@@ -192,6 +192,8 @@
+
+
@@ -206,9 +208,7 @@
-
-
-
+
diff --git a/service-department/src/main/resources/templates/department/update.html b/service-department/src/main/resources/templates/department/update.html index 7dcf9a96..dd3b3078 100644 --- a/service-department/src/main/resources/templates/department/update.html +++ b/service-department/src/main/resources/templates/department/update.html @@ -63,14 +63,16 @@
-
-
+
+
- +
+
+
@@ -82,8 +84,6 @@
-
-
@@ -96,6 +96,8 @@
+
+
@@ -105,8 +107,6 @@
-
-
@@ -115,6 +115,8 @@
+
+
@@ -123,8 +125,6 @@
-
-
@@ -133,6 +133,8 @@
+ +
@@ -141,8 +143,6 @@
- -
@@ -157,6 +157,8 @@
+
+
@@ -171,8 +173,6 @@
-
-
@@ -187,6 +187,8 @@
+
+
@@ -201,8 +203,6 @@
-
-
@@ -217,7 +217,9 @@
-
+
+
+
diff --git a/service-department/src/main/resources/templates/department/user/list.html b/service-department/src/main/resources/templates/department/user/list.html index 0824a505..b3ed02ef 100644 --- a/service-department/src/main/resources/templates/department/user/list.html +++ b/service-department/src/main/resources/templates/department/user/list.html @@ -80,6 +80,11 @@ {field:'rowNum', width:80, title: '序号', align:'center', templet: '{{d.LAY_INDEX}}'}, {field:'userUsername', width:140, title: '用户名', align:'center'}, {field:'userName', width:140, title: '昵称', align:'center'}, + {field:'userSort', width:140, title: '排序', align:'center', + templet: function(item) { + return item.userSort; + } + }, {field:'userPhone', width:140, title: '手机', align:'center', templet: function(item) { if(!item.userPhone) { diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java index 9d21bbf8..bd088ea5 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java @@ -103,6 +103,17 @@ public class PositionUserServiceImpl extends DefaultBaseService implements IPosi return positionService.listPO(positionIds); } + @Override + public List listPositionPOByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + List positionIds = positionUserDao.listPositionId(params); + if (positionIds.isEmpty()) { + return new ArrayList<>(); + } + return positionService.listPO(positionIds); + } + private List listGroupUserId(Map params) { return positionUserDao.listGroupUserId(params); }