过滤掉状态不正常的机构/用户

bpm-core/src/main/java/com/srm/bpm/facade/rest/ProcessTreeRestController.java

@@ -32,14 +32,15 @@ public class ProcessTreeRestController {
 
     @GetMapping("/organization")
     public R organization(String q) {
-        final List<ZTreeDTO> organization = userCenterlogic.organization("",Strings.isNullOrEmpty(q) ? "" : q);
+        final List<ZTreeDTO> organization = userCenterlogic.organization("",Strings.isNullOrEmpty(q) ? "" : q, null);
         return R.ok(organization);
     }
 
     @GetMapping("/organization/user")
     public R organizationUser(String q,
-                              @RequestParam(value = "onlyChoiceUser", required = false) boolean onlyChoiceUser) {
-        return R.ok(userCenterlogic.organizationUser("",q, onlyChoiceUser));
+                              @RequestParam(value = "onlyChoiceUser", required = false) boolean onlyChoiceUser,
+                              @RequestParam(value = "state", required = false) String state) {
+        return R.ok(userCenterlogic.organizationUser("",q, onlyChoiceUser, state));
     }
 
 

bpm-core/src/main/java/com/srm/bpm/logic/service/UserCenterlogic.java

@@ -21,9 +21,9 @@ import cn.hutool.core.lang.Pair;
  * @since JDK 1.8
  */
 public interface UserCenterlogic {
-    List<ZTreeDTO> organization(String pid, String s);
+    List<ZTreeDTO> organization(String pid, String s, String state);
 
-    List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser);
+    List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser, String state);
 
     List<ZTreeDTO> positionUser(String pid);
 

bpm-core/src/main/resources/static/designer/app/modules/employee-dialog.js

@@ -57,7 +57,7 @@ define(function (require, exports, module) {
         }
 
         employeeChoiceTree = $treeDom.initZtree({
-            service: g.ctx + 'process/tree/rest/organization/user?onlyChoiceUser=1'
+            service: g.ctx + 'process/tree/rest/organization/user?onlyChoiceUser=1&state=Y'
         }, org_tree_setting);
     };
     /**

bpm-server/src/main/java/com/srm/bpmserver/infra/dao/UserCenterDao.java

@@ -26,9 +26,9 @@ import java.util.Set;
  * @since JDK 1.8
  */
 public interface UserCenterDao {
-    List<OrganizationPO> selectOrg(@Param("pid") String pid, @Param("q") String q);
+    List<OrganizationPO> selectOrg(@Param("pid") String pid, @Param("q") String q, @Param("state") String state);
 
-    List<UserOrgPO> selectUsers(@Param("pid") String pid);
+    List<UserOrgPO> selectUsers(@Param("pid") String pid, @Param("state") String state);
 
     List<PositionPO> selectAllPosition(@Param("pid") String pid, @Param("q") String s);
 

bpm-server/src/main/java/com/srm/bpmserver/logic/impl/UserCenterLogicImpl.java

@@ -50,7 +50,7 @@ public class UserCenterLogicImpl implements UserCenterlogic {
     private final TreeConvert treeConvert;
 
     @Override
-    public List<ZTreeDTO> organization(String pid, String q) {
+    public List<ZTreeDTO> organization(String pid, String q, String state) {
         //查询部门信息
         List<ZTreeDTO> zTreeDTOS = Lists.newArrayList();
         if (Strings.isNullOrEmpty(pid)) {
@@ -62,7 +62,7 @@ public class UserCenterLogicImpl implements UserCenterlogic {
             topLevel.setOpen(true);
             zTreeDTOS.add(topLevel);
         }
-        final List<OrganizationPO> organizationPOS = userCenterDao.selectOrg(pid, q);
+        final List<OrganizationPO> organizationPOS = userCenterDao.selectOrg(pid, q, state);
         for (OrganizationPO organizationPO : organizationPOS) {
             final ZTreeDTO zTreeDTO = treeConvert.organizationPOToDTO(organizationPO);
             zTreeDTO.setData(organizationPO);
@@ -72,13 +72,13 @@ public class UserCenterLogicImpl implements UserCenterlogic {
     }
 
     @Override
-    public List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser) {
-        List<ZTreeDTO> zTreeDTOS = this.organization(pid, q);
+    public List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser, String state) {
+        List<ZTreeDTO> zTreeDTOS = this.organization(pid, q, state);
         for (ZTreeDTO zTreeDTO : zTreeDTOS) {
             zTreeDTO.setNocheck(onlyChoiceUser);
         }
 
-        List<UserOrgPO> userOrgPOS = userCenterDao.selectUsers(pid);
+        List<UserOrgPO> userOrgPOS = userCenterDao.selectUsers(pid, state);
         for (UserOrgPO userOrgPO : userOrgPOS) {
             final ZTreeDTO zTreeDTO = new ZTreeDTO();
             zTreeDTO.setId(userOrgPO.getId());

bpm-server/src/main/resources/mapper/bpmserver/infra/UserCenterDao.xml

@@ -14,6 +14,9 @@
             <if test="pid!=null and pid!=''">
                 AND org_parent_id=#{pid}
             </if>
+            <if test="state!=null and state!=''">
+                AND state=#{state}
+            </if>
         </where>
     </select>
     <select id="selectUsers" resultType="com.srm.bpmserver.infra.po.UserOrgPO">
@@ -25,6 +28,9 @@
         <if test="pid!=null and pid!=''">
             AND so.org_id =#{pid}
         </if>
+        <if test="state!=null and state != ''">
+            AND ep.deletestatus = 0
+        </if>
         ORDER BY ep.create_date DESC
     </select>
     <select id="selectAllPosition" resultType="com.srm.bpmserver.infra.po.PositionPO">