调整用户机构

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -82,6 +82,7 @@ public class SysOrgExtend extends BaseEntity {
     @ApiModelProperty(value = "有无保安")
 //    @JsonSerialize(using = ToStringSerializer.class)
     private Long askari;
+    private Long businessLibrary;
 
     /**
      * 保安证

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -101,9 +101,9 @@ public class SysDeptController extends BaseController {
         Long deptId = dept.getId();
 //        deptService.checkDeptDataScope(deptId);
         if (orgService.list(new QueryWrapper<SysOrg>().eq("name", dept.getName()).eq("deleted", 0L)).size() > 1) {
-            return error("修改部门'" + dept.getName() + "'失败，部门名称已存在");
+            return error("修改机构'" + dept.getName() + "'失败，机构名称已存在");
         } else if (dept.getParentId().equals(deptId)) {
-            return error("修改部门'" + dept.getName() + "'失败，上级部门不能是自己");
+            return error("修改机构'" + dept.getName() + "'失败，上级机构不能是自己");
         }
 //        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getIsLock()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
 //        {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysOrgExtendDto.java

@@ -45,6 +45,8 @@ public class SysOrgExtendDto  {
     @ApiModelProperty(value = "nh名称")
     @TableField(value = "name")
     private String name;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long businessLibrary;
 
     @ApiModelProperty(value = "上级nh")
     @JsonSerialize(using = ToStringSerializer.class)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -177,6 +177,7 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         extend.setDetachedLobbyEquipment(sysOrgExtend.getDetachedLobbyEquipment());
         extend.setDetachedWallPenetratingEquipment(sysOrgExtend.getDetachedWallPenetratingEquipment());
         extend.setCashAddingRoomRemoteControl(sysOrgExtend.getCashAddingRoomRemoteControl());
+        extend.setBusinessLibrary(sysOrgExtend.getBusinessLibrary());
         if (sysOrgExtend.getOrgExtendId()!=null){
             extend.setOrgId(org.getId());
             extend.setId(sysOrgExtend.getOrgExtendId());