ibizdev提交

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java

@@ -128,6 +128,14 @@ public class IBZOrganization extends EntityMP implements Serializable {
     private cn.ibizlab.core.ou.domain.IBZOrganization parentorg;
 
 
+    /**
+     * 部门
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private List<cn.ibizlab.core.ou.domain.IBZDepartment> depts;
+
 
     /**
      * 设置 [单位代码]

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZDepartmentService.java

@@ -41,6 +41,7 @@ public interface IIBZDepartmentService extends IService<IBZDepartment>{
     void removeByParentdeptid(String deptid) ;
     List<IBZDepartment> selectByOrgid(String orgid) ;
     void removeByOrgid(String orgid) ;
+    void saveByOrgid(String orgid,List<IBZDepartment> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDepartmentServiceImpl.java

@@ -170,6 +170,35 @@ public class IBZDepartmentServiceImpl extends ServiceImpl<IBZDepartmentMapper, I
         this.remove(new QueryWrapper<IBZDepartment>().eq("orgid",orgid));
     }
 
+	@Override
+    public void saveByOrgid(String orgid,List<IBZDepartment> list) {
+        if(list==null)
+            return;
+        Set<String> delIds=new HashSet<String>();
+        List<IBZDepartment> _update=new ArrayList<IBZDepartment>();
+        List<IBZDepartment> _create=new ArrayList<IBZDepartment>();
+        for(IBZDepartment before:selectByOrgid(orgid)){
+            delIds.add(before.getDeptid());
+        }
+        for(IBZDepartment sub:list) {
+            sub.setOrgid(orgid);
+            if(ObjectUtils.isEmpty(sub.getDeptid()))
+                sub.setDeptid((String)sub.getDefaultKey(true));
+            if(delIds.contains(sub.getDeptid())) {
+                delIds.remove(sub.getDeptid());
+                _update.add(sub);
+            }
+            else
+                _create.add(sub);
+        }
+        if(_update.size()>0)
+            this.updateBatch(_update);
+        if(_create.size()>0)
+            this.createBatch(_create);
+        if(delIds.size()>0)
+            this.removeBatch(delIds);
+	}
+
 
     /**
      * 查询集合 CurDept

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZOrganizationServiceImpl.java

@@ -66,6 +66,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
         fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("orgid",et.getOrgid())))
             return false;
+        ibzdepartmentService.saveByOrgid(et.getOrgid(),et.getDepts());
         CachedBeanCopier.copy(get(et.getOrgid()),et);
         return true;
     }
@@ -82,6 +83,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
         fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
+        ibzdepartmentService.saveByOrgid(et.getOrgid(),et.getDepts());
         CachedBeanCopier.copy(get(et.getOrgid()),et);
         return true;
     }
@@ -121,6 +123,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
     @Override
     @Transactional
     public boolean remove(String key) {
+        ibzdepartmentService.removeByOrgid(key) ;
         boolean result=removeById(key);
         return result ;
     }
@@ -139,6 +142,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
             et.setOrgid(key);
         }
         else{
+            et.setDepts(ibzdepartmentService.selectByOrgid(key));
         }
         return et;
     }