order字段

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DepartmentDTO.java

@@ -31,7 +31,7 @@ public class DepartmentDTO implements Serializable {
     
     private Integer level;
     
-    private Integer sort;
+    private Long sort;
     
     private Integer staffCount;
     
@@ -159,15 +159,15 @@ public class DepartmentDTO implements Serializable {
 		this.level = level;
 	}
 
-	public Integer getSort() {
-		return sort;
-	}
+    public Long getSort() {
+        return sort;
+    }
 
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
 
-	public String getWxEnterpriseId() {
+    public String getWxEnterpriseId() {
 		return wxEnterpriseId;
 	}
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -26,7 +26,7 @@ public interface DepartmentMapper {
 
 	List<TabHaobanDepartment> listStoreLikeName(@Param("departmentName")String departmentName);
 
-	int selectMaxSort(@Param("parentDepartmentId")String parentDepartmentId);
+	long selectMaxSort(@Param("parentDepartmentId")String parentDepartmentId);
 
 	List<TabHaobanDepartment> selectByRelatedId(@Param("relatedId")String relatedId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanDepartment.java

@@ -30,7 +30,7 @@ public class TabHaobanDepartment implements Serializable {
     
     private Integer level;
     
-    private Integer sort;
+    private Long sort;
     
     private String wxEnterpriseId;
     
@@ -148,15 +148,15 @@ public class TabHaobanDepartment implements Serializable {
 		this.level = level;
 	}
 
-	public Integer getSort() {
-		return sort;
-	}
+    public Long getSort() {
+        return sort;
+    }
 
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
 
-	public String getWxEnterpriseId() {
+    public String getWxEnterpriseId() {
 		return wxEnterpriseId;
 	}
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java

@@ -41,9 +41,9 @@ public class DepartmentServiceImpl implements DepartmentService {
 		Date now = new Date();
 		TabHaobanDepartment tab = EntityUtil.changeEntityByJSON(TabHaobanDepartment.class, department);
         tab.setDepartmentId(StringUtil.randomUUID());
-        Integer sort = tab.getSort();
+        Long sort = tab.getSort();
         if(sort == null) {
-            int maxSort = mapper.selectMaxSort(department.getParentDepartmentId());
+            long maxSort = mapper.selectMaxSort(department.getParentDepartmentId());
             tab.setSort(maxSort + 1);
 
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -107,9 +107,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(department.getWxEnterpriseId());
 		logger.info("【部门新增】enterpriseDTO = {}",JSON.toJSONString(enterpriseDTO));
 		if(enterpriseDTO != null) {
-			Integer sort = department.getSort();
+			Long sort = department.getSort();
 			if(sort == null) {
-				int maxSort = departmentMapper.selectMaxSort(department.getParentDepartmentId());
+				long maxSort = departmentMapper.selectMaxSort(department.getParentDepartmentId());
 				department.setSort(maxSort + 1);
 			}
 			

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -18,7 +18,7 @@
     <result column="wx_department_id" property="wxDepartmentId" jdbcType="VARCHAR" />
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
     <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
-    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="sort" property="sort" jdbcType="BIGINT" />
     <result column="level" property="level" jdbcType="INTEGER" />
     <result column="temp_flag" property="tempFlag" jdbcType="INTEGER"/>
   </resultMap>
@@ -255,7 +255,7 @@
     and is_store =1
   </select>
   
-  <select id="selectMaxSort" resultType="java.lang.Integer" parameterType="java.lang.String" >
+  <select id="selectMaxSort" resultType="java.lang.Long" parameterType="java.lang.String" >
     select 
     ifnull(max(sort),0)
     from tab_haoban_department