增加接口和方法

basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java

@@ -34,6 +34,24 @@ public interface IDepartmentUserBaseService {
      */
     List<String> listUserId(List<String> departmentIds);
 
+    /**
+     * 用户ID列表
+     *
+     * @param departmentId 部门ID
+     * @param userIds      用户ID列表
+     * @return
+     */
+    List<String> listUserId(String departmentId, List<String> userIds);
+
+    /**
+     * 用户ID列表
+     *
+     * @param departmentIds 部门ID列表
+     * @param userIds       用户ID列表
+     * @return
+     */
+    List<String> listUserId(List<String> departmentIds, List<String> userIds);
+
     /**
      * 用户列表
      *

basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionUserBaseService.java

@@ -51,4 +51,12 @@ public interface IPositionUserBaseService {
      * @return
      */
     List<PositionPO> listPositionPOByUserId(String userId);
+
+    /**
+     * 职位列表
+     *
+     * @param userIds
+     * @return
+     */
+    List<PositionPO> listPositionPOByUserIds(List<String> userIds);
 }

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();

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<ContentDTO> list(Map<String, Object> params);
 
+    /**
+     * 文章内容列表
+     *
+     * @param categoryId 目录ID
+     * @return
+     */
+    List<ContentDTO> list(String categoryId);
+
+    /**
+     * 文章列表
+     *
+     * @param userId 用户ID
+     * @return
+     */
+    List<ContentDTO> listByUserId(String userId);
+
+    /**
+     * 文章列表
+     *
+     * @param userIds 用户ID列表
+     * @return
+     */
+    List<ContentDTO> listByUserIds(List<String> userIds);
+
+    /**
+     * 文章列表
+     *
+     * @param categoryId 目录ID
+     * @param userId     用户ID
+     * @return
+     */
+    List<ContentDTO> listByUserId(String categoryId, String userId);
+
+    /**
+     * 文章列表
+     *
+     * @param categoryId 目录ID
+     * @param userIds    用户ID列表
+     * @return
+     */
+    List<ContentDTO> listByUserIds(String categoryId, List<String> userIds);
+
     /**
      * 文章内容分页列表
      *
@@ -106,6 +165,59 @@ public interface IContentService extends IArticleCheckService {
      */
     SuccessResultList<List<ContentDTO>> listPage(ListPage page);
 
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPage(String categoryId, ListPage page);
+
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param userId
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPageByUserId(String categoryId, String userId, ListPage page);
+
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param userIds
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page);
+
+    /**
+     * 文章内容列表（带数据权限）
+     *
+     * @param params
+     * @return
+     */
+    List<ContentDTO> listWithDataAuth(Map<String, Object> params);
+
+    /**
+     * 文章内容列表（带数据权限）
+     *
+     * @param categoryId 目录ID
+     * @return
+     */
+    List<ContentDTO> listWithDataAuth(String categoryId);
+
+    /**
+     * 文章内容分页列表（带数据权限）
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPageWithDataAuth(ListPage page);
+
     /**
      * 统计文章数量
      *

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<String, Object> 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<ContentDTO> list(String categoryId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("categoryId", categoryId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserId(String userId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("creator", userId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserIds(List<String> userIds) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("creators", userIds);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserId(String categoryId, String userId) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("categoryId", categoryId);
+        params.put("creator", userId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserIds(String categoryId, List<String> userIds) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("categoryId", categoryId);
+        params.put("creators", userIds);
+        return list(params);
+    }
+
     @Override
     public SuccessResultList<List<ContentDTO>> 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<List<ContentDTO>> listPage(String categoryId, ListPage page) {
+        page.getParams().put("categoryId", categoryId);
+        return listPage(page);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPageByUserId(String categoryId, String userId, ListPage page) {
+        page.getParams().put("categoryId", categoryId);
+        page.getParams().put("creator", userId);
+        return listPage(page);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page) {
+        page.getParams().put("categoryId", categoryId);
+        page.getParams().put("creators", userIds);
+        return listPage(page);
+    }
+
+    @Override
+    public List<ContentDTO> listWithDataAuth(Map<String, Object> params) {
+        setDataAuthorityInfo(params);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listWithDataAuth(String categoryId) {
+        Map<String, Object> params = getHashMap(16);
+        params.put("categoryId", categoryId);
+        setDataAuthorityInfo(params);
+        return list(params);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPageWithDataAuth(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        setDataAuthorityInfo(page.getParams());
+        List<ContentDTO> articleContentDTOs = list(page.getParams());
+        PageInfo<ContentDTO> pageInfo = new PageInfo<>(articleContentDTOs);
+        return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
     @Override
     public Integer count(Map<String, Object> params) {
         Integer count = contentDao.count(params);

module-article/src/main/resources/mybatis/mapper/content/content-mapper.xml

@@ -238,13 +238,28 @@
             t1.creator = #{creator}
         </if>
         <if test="creators != null and creators.size > 0">
-            AND
+        AND
             t1.creator IN
             <foreach collection="creators" index="index" open="(" separator="," close=")">
                 #{creators[${index}]}
             </foreach>
         </if>
-        ORDER BY t1.publish_date DESC, t1.gmt_create DESC
+        <if test="data_authority != null">
+            <choose>
+                <when test="data_authority == 'self'">
+        AND
+            t1.creator = #{data_creator}
+                </when>
+                <otherwise>
+        AND
+            t1.creator IN
+                    <foreach collection="data_creators" index="index" open="(" separator="," close=")">
+                #{data_creators[${index}]}
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        ORDER BY t1.publish_date DESC
     </select>
 
     <!-- 统计文章数量 -->

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"),

service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java

@@ -45,6 +45,14 @@ public interface IDepartmentUserDao {
      */
     void delete(Map<String, Object> params) throws RemoveException;
 
+    /**
+     * 更新组织用户排序
+     *
+     * @param params
+     * @throws UpdateException
+     */
+    void updateSort(Map<String, Object> params) throws UpdateException;
+
     /**
      * 用户ID列表
      *
@@ -70,4 +78,5 @@ public interface IDepartmentUserDao {
      * @throws SearchException
      */
     List<String> listDepartmentId(Map<String, Object> params) throws SearchException;
+
 }

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;
+    }
+}

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<String> userIds);
 
+    /**
+     * 更新用户排序
+     *
+     * @param departmentId
+     * @param departmentUserSortVO
+     */
+    void updateSort(String departmentId, DepartmentUserSortVO departmentUserSortVO);
+
     /**
      * 部门列表
      *
@@ -66,4 +75,5 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService {
      * @return
      */
     List<DepartmentPO> listDepartmentPOByUserId(String userId);
+
 }

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<String, Object> params = getHashMap(6);
+        params.put("departmentId", departmentId);
+        params.put("userId", departmentUserSortVO.getUserId());
+        params.put("userSort", departmentUserSortVO.getUserSort());
+        departmentUserDao.updateSort(params);
+    }
+
     @Override
     public List<DepartmentPO> listDepartmentPOByUserId(String userId) {
         Map<String, Object> params = getHashMap(2);
@@ -138,6 +148,22 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
         return departmentUserDao.listUserId(params);
     }
 
+    @Override
+    public List<String> listUserId(String departmentId, List<String> userIds) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentId", departmentId);
+        params.put("userIds", userIds);
+        return departmentUserDao.listUserId(params);
+    }
+
+    @Override
+    public List<String> listUserId(List<String> departmentIds, List<String> userIds) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentIds", departmentIds);
+        params.put("userIds", userIds);
+        return departmentUserDao.listUserId(params);
+    }
+
     @Override
     public SuccessResultList<List<DepartmentUserDTO>> listPage(String departmentId, ListPage page) {
         SuccessResultList<List<UserDTO>> successResultList;

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',

service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml

@@ -32,49 +32,73 @@
     <delete id="delete" parameterType="map" flushCache="true">
         DELETE FROM
             sys_department_user
-        where
-            1 = 1
-        <if test="departmentId != null and departmentId != ''">
+        <where>
+            <if test="departmentId != null and departmentId != ''">
         AND
             department_id = #{departmentId}
-        </if>
-        <if test="departmentIds != null and departmentIds.size > 0">
+            </if>
+            <if test="departmentIds != null and departmentIds.size > 0">
         AND
             department_id IN
-            <foreach collection="departmentIds" index="index" open="(" separator="," close=")">
+                <foreach collection="departmentIds" index="index" open="(" separator="," close=")">
                 #{departmentIds[${index}]}
-            </foreach>
-        </if>
-        <if test="userId != null and userId != ''">
+                </foreach>
+            </if>
+            <if test="userId != null and userId != ''">
         AND
             user_id = #{userId}
-        </if>
-        <if test="userIds != null and userIds.size > 0">
+            </if>
+            <if test="userIds != null and userIds.size > 0">
         AND
             user_id IN
-            <foreach collection="userIds" index="index" open="(" separator="," close=")">
+                <foreach collection="userIds" index="index" open="(" separator="," close=")">
                 #{userIds[${index}]}
-            </foreach>
-        </if>
+                </foreach>
+            </if>
+        </where>
     </delete>
 
+    <!-- 更新组织用户排序 -->
+    <update id="updateSort" parameterType="map" flushCache="true">
+        UPDATE
+            sys_department_user
+        SET
+            user_sort = #{userSort}
+        WHERE
+            department_id = #{departmentId}
+        AND
+            user_sort = #{userSort}
+    </update>
+
     <!-- 用户ID列表 -->
     <select id="listUserId" parameterType="map" resultType="java.lang.String">
         SELECT
             user_id
         FROM
             sys_department_user
-        WHERE
-        <if test="departmentId != null and departmentId != ''">
+        <where>
+            <if test="departmentId != null and departmentId != ''">
             department_id = #{departmentId}
-        </if>
-        <if test="departmentIds != null and departmentIds.size > 0">
-            department_id IN (
-            <foreach collection="departmentIds" index="index" open="(" separator="," close=")">
-                #{departmentIds[${index}]}
-            </foreach>
-            )
-        </if>
+            </if>
+            <if test="departmentIds != null and departmentIds.size > 0">
+            AND
+                department_id IN (
+                <foreach collection="departmentIds" index="index" open="(" separator="," close=")">
+                    #{departmentIds[${index}]}
+                </foreach>
+                )
+            </if>
+            <if test="userIds != null and userIds.size > 0">
+            AND
+                user_id IN (
+                <foreach collection="userIds" index="index" open="(" separator="," close=")">
+                    #{userIds[${index}]}
+                </foreach>
+                )
+            </if>
+        </where>
+        ORDER BY
+            user_sort
     </select>
 
     <!-- 用户ID列表 -->

service-department/src/main/resources/templates/department/save-merge.html

@@ -46,16 +46,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">组织说明</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织类型 *</label>
@@ -67,6 +57,18 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                        <div class="layui-form-item layui-form-text">
+                            <label class="layui-form-label">组织说明</label>
+                            <div class="layui-input-block">
+                                <textarea id="departmentSummary" name="departmentSummary" class="layui-textarea" placeholder="请输入组织说明"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织状态 *</label>
@@ -79,8 +81,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">负责人</label>
@@ -90,6 +90,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
@@ -98,8 +100,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
@@ -108,6 +108,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
@@ -116,8 +118,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织排序</label>
@@ -126,6 +126,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">1级区域</label>
@@ -140,8 +142,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">2级区域</label>
@@ -156,6 +156,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">3级区域</label>
@@ -170,8 +172,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">4级区域</label>
@@ -186,6 +186,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">5级区域</label>
@@ -200,9 +202,7 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
-                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">

service-department/src/main/resources/templates/department/save-split.html

@@ -52,16 +52,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">组织说明</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织类型 *</label>
@@ -73,6 +63,18 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                        <div class="layui-form-item layui-form-text">
+                            <label class="layui-form-label">组织说明</label>
+                            <div class="layui-input-block">
+                                <textarea id="departmentSummary" name="departmentSummary" class="layui-textarea" placeholder="请输入组织说明"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织状态 *</label>
@@ -85,8 +87,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">负责人</label>
@@ -96,6 +96,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
@@ -104,8 +106,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
@@ -114,6 +114,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
@@ -122,8 +124,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织排序</label>
@@ -132,6 +132,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">1级区域</label>
@@ -146,8 +148,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">2级区域</label>
@@ -162,6 +162,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">3级区域</label>
@@ -176,8 +178,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">4级区域</label>
@@ -192,6 +192,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">5级区域</label>
@@ -206,9 +208,7 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
-                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">

service-department/src/main/resources/templates/department/save.html

@@ -63,14 +63,16 @@
                     </div>
                 </div>
                 <div class="layui-row">
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                        <div class="layui-form-item layui-form-text">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
+                                <textarea id="departmentSummary" name="departmentSummary" class="layui-textarea" placeholder="请输入组织说明"></textarea>
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织类型 *</label>
@@ -81,21 +83,21 @@
                                 </select>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-row">
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">组织状态 *</label>
-                            <div class="layui-input-block">
-                                <select name="departmentState" lay-verify="required">
-                                    <option value="1" selected>正常</option>
-                                    <option value="2">异常</option>
-                                    <option value="3">停用</option>
-                                </select>
+                        <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">组织状态 *</label>
+                                <div class="layui-input-block">
+                                    <select name="departmentState" lay-verify="required">
+                                        <option value="1" selected>正常</option>
+                                        <option value="2">异常</option>
+                                        <option value="3">停用</option>
+                                    </select>
+                                </div>
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">负责人</label>
@@ -105,8 +107,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
@@ -115,6 +115,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
@@ -123,8 +125,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
@@ -133,6 +133,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织排序</label>
@@ -141,8 +143,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">1级区域</label>
@@ -157,6 +157,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">2级区域</label>
@@ -171,8 +173,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">3级区域</label>
@@ -187,6 +187,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">4级区域</label>
@@ -201,8 +203,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">5级区域</label>
@@ -217,7 +217,9 @@
                             </script>
                         </div>
                     </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                </div>
+                <div class="layui-row">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">

service-department/src/main/resources/templates/department/update-split.html

@@ -52,16 +52,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">组织说明</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织类型 *</label>
@@ -73,6 +63,18 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                        <div class="layui-form-item layui-form-text">
+                            <label class="layui-form-label">组织说明</label>
+                            <div class="layui-input-block">
+                                <textarea id="departmentSummary" name="departmentSummary" class="layui-textarea" placeholder="请输入组织说明"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织状态 *</label>
@@ -85,8 +87,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">负责人</label>
@@ -96,6 +96,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
@@ -104,8 +106,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
@@ -114,6 +114,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
@@ -122,8 +124,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织排序</label>
@@ -132,6 +132,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">1级区域</label>
@@ -146,8 +148,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">2级区域</label>
@@ -162,6 +162,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">3级区域</label>
@@ -176,8 +178,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">4级区域</label>
@@ -192,6 +192,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">5级区域</label>
@@ -206,9 +208,7 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
-                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">

service-department/src/main/resources/templates/department/update.html

@@ -63,14 +63,16 @@
                     </div>
                 </div>
                 <div class="layui-row">
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                        <div class="layui-form-item">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
+                        <div class="layui-form-item layui-form-text">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
+                                <textarea id="departmentSummary" name="departmentSummary" class="layui-textarea" placeholder="请输入组织说明"></textarea>
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织类型 *</label>
@@ -82,8 +84,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织状态 *</label>
@@ -96,6 +96,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">负责人</label>
@@ -105,8 +107,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
@@ -115,6 +115,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
@@ -123,8 +125,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
@@ -133,6 +133,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织排序</label>
@@ -141,8 +143,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">1级区域</label>
@@ -157,6 +157,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">2级区域</label>
@@ -171,8 +173,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">3级区域</label>
@@ -187,6 +187,8 @@
                             </script>
                         </div>
                     </div>
+                </div>
+                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">4级区域</label>
@@ -201,8 +203,6 @@
                             </script>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
                     <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">5级区域</label>
@@ -217,7 +217,9 @@
                             </script>
                         </div>
                     </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                </div>
+                <div class="layui-row">
+                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">

service-department/src/main/resources/templates/department/user/list.html

@@ -80,6 +80,11 @@
                         {field:'rowNum', width:80, title: '序号', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
                         {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) {

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<PositionPO> listPositionPOByUserIds(List<String> userIds) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("userIds", userIds);
+        List<String> positionIds = positionUserDao.listPositionId(params);
+        if (positionIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return positionService.listPO(positionIds);
+    }
+
     private List<String> listGroupUserId(Map<String, Object> params) {
         return positionUserDao.listGroupUserId(params);
     }