修改department的数据类型

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/DepartmentBo.java

@@ -11,7 +11,7 @@ public class DepartmentBo {
     private String departmentName;
     private String departmentCode;
     private String level;
-    private String deptOrgCode;
+    private Integer deptOrgCode;
     private String orgCode;
     private String departmentDesc;
     private Long companySeq;
@@ -34,11 +34,12 @@ public class DepartmentBo {
 	public void setDepartmentCode(String departmentCode) {
 		this.departmentCode = departmentCode;
 	}
-    public String getDeptOrgCode() {
+
+	public Integer getDeptOrgCode() {
 		return deptOrgCode;
 	}
 
-	public void setDeptOrgCode(String deptOrgCode) {
+	public void setDeptOrgCode(Integer deptOrgCode) {
 		this.deptOrgCode = deptOrgCode;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -122,7 +122,7 @@ public class LoginController extends AbstractBaseController{
             departmentBo.setLevel(departmentModel.getLevel());
             departmentBo.setOrgCode(departmentModel.getOrgCode());
             departmentBo.setParentId(departmentModel.getParentId());
-            departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode().toString());
+            departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode());
             departmentBo.setSequenceNbr(departmentModel.getSequenceNbr());
         }
         return departmentBo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java

@@ -121,7 +121,7 @@ public class PermissionAspect {
 			departmentBo.setLevel(departmentModel.getLevel());
 			departmentBo.setOrgCode(departmentModel.getOrgCode());
 			departmentBo.setParentId(departmentModel.getParentId());
-			departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode().toString());
+			departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode());
 			departmentBo.setSequenceNbr(departmentModel.getSequenceNbr());
 		}
 		return departmentBo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java

@@ -244,7 +244,7 @@ public class GroupController extends AbstractBaseController{
 					departmentBo.setCompanySeq(x.getCompanySeq());
 					departmentBo.setDepartmentDesc(x.getDepartmentDesc());
 					departmentBo.setDepartmentName(x.getDepartmentName());
-					departmentBo.setDeptOrgCode(x.getOrgCode());
+					departmentBo.setDeptOrgCode(x.getDeptOrgCode());
 					departmentBo.setLevel(x.getLevel());
 					departmentBo.setOrgCode(x.getOrgCode());
 					departmentBo.setParentId(x.getParentId());
@@ -268,7 +268,7 @@ public class GroupController extends AbstractBaseController{
 					departmentBo.setCompanySeq(Long.valueOf(x.get("companySeq").toString()));
 					departmentBo.setDepartmentDesc(x.get("departmentDesc")+"");
 					departmentBo.setDepartmentName(x.get("departmentName")+"");
-					departmentBo.setDeptOrgCode(x.get("orgCode")+"");
+					departmentBo.setDeptOrgCode(Integer.valueOf(x.get("deptOrgCode")+""));
 					departmentBo.setLevel(x.get("level")+"");
 					departmentBo.setOrgCode(x.get("orgCode")+"");
 					departmentBo.setParentId(Long.valueOf(x.get("parentId").toString()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -983,7 +983,7 @@ public class CheckServiceImpl implements ICheckService {
                     departmentBo.setCompanySeq(x.getCompanySeq());
                     departmentBo.setDepartmentDesc(x.getDepartmentDesc());
                     departmentBo.setDepartmentName(x.getDepartmentName());
-                    departmentBo.setDeptOrgCode(x.getOrgCode());
+                    departmentBo.setDeptOrgCode(x.getDeptOrgCode());
                     departmentBo.setLevel(x.getLevel());
                     departmentBo.setOrgCode(x.getOrgCode());
                     departmentBo.setParentId(x.getParentId());
@@ -1007,7 +1007,7 @@ public class CheckServiceImpl implements ICheckService {
                     departmentBo.setCompanySeq(Long.valueOf(x.get("companySeq").toString()));
                     departmentBo.setDepartmentDesc(x.get("departmentDesc")+"");
                     departmentBo.setDepartmentName(x.get("departmentName")+"");
-                    departmentBo.setDeptOrgCode(x.get("orgCode")+"");
+                    departmentBo.setDeptOrgCode(Integer.valueOf(x.get("deptOrgCode")+""));
                     departmentBo.setLevel(x.get("level")+"");
                     departmentBo.setOrgCode(x.get("orgCode")+"");
                     departmentBo.setParentId(Long.valueOf(x.get("parentId")+""));

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/framework/PermissionAspect.java

@@ -130,7 +130,7 @@ public class PermissionAspect {
 			departmentBo.setLevel(departmentModel.getLevel());
 			departmentBo.setOrgCode(departmentModel.getOrgCode());
 			departmentBo.setParentId(departmentModel.getParentId());
-			departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode().toString());
+			departmentBo.setDeptOrgCode(departmentModel.getDeptOrgCode());
 			departmentBo.setSequenceNbr(departmentModel.getSequenceNbr());
 		}
 		return departmentBo;