完善用章申请的流程

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java

@@ -228,4 +228,7 @@ public interface SysUserFeign {
     @ApiOperation(value = "查询是否需要更换密码")
     @GetMapping(value = "/selectPasswordByUserSid/{userSid}")
     ResultBean<Boolean> selectPasswordByUserSid(@PathVariable("userSid")String userSid);
+    @ApiOperation(value = "获取角色的用户")
+    @GetMapping(value = "getUserByRoleNoOrgPath")
+    ResultBean<List<SysUserVo>> getUserByRoleNoOrgPath(@SpringQueryMap UserQuery userQuery);
 }

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java

@@ -214,4 +214,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysUserVo>> getUserByRoleNoOrgPath(UserQuery userQuery) {
+		return null;
+	}
 }

yxt_supervise/supervise-system/supervise-system-biz/pom.xml

@@ -114,17 +114,7 @@
         <artifactId>fastcsv</artifactId>
         <version>2.2.1</version>
     </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.yxt.supervise</groupId>-->
-<!--            <artifactId>supervise-flowable-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-        <!--        <dependency>-->
-<!--            <groupId>com.yxt.supervise</groupId>-->
-<!--            <artifactId>supervise-flowable-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
+
     </dependencies>
 
     <build>

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/SystemApplication.java

@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.supervise.system"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.supervise.*","com.yxt.anrui.flowable"})
+@EnableFeignClients(basePackages = {"com.yxt.supervise.*"})
 public class SystemApplication {
     public static void main(String[] args) {
         SpringApplication.run(SystemApplication.class, args);

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/feign/FlowDefinitionFeign.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @description 流程定义
  */
 @FeignClient(
-        contextId = "supervise-flowable-FlowDefinition",
+        contextId = "supervise-system-FlowDefinition",
         name = "supervise-flowable",
         path = "/v1/flowable/definition")
 public interface FlowDefinitionFeign {

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/feign/FlowableFeign.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "Flowable")
 @FeignClient(
-        contextId = "supervise-flowable-Flowable",
+        contextId = "supervise-system-Flowable",
         name = "supervise-flowable",
         path = "v1/flow")
 public interface FlowableFeign {

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/feign/ProcessCommentFeign.java

@@ -52,7 +52,7 @@ import java.util.List;
  * @since 1.0
  */
 @FeignClient(
-        contextId = "processcomment-ProcessComment",
+        contextId = "processcomment-system-ProcessComment",
         name = "supervise-flowable",
         path = "v1/processcomment")
 public interface ProcessCommentFeign {

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/feign/SysFormLinkFeign.java

@@ -29,7 +29,7 @@ import java.util.Map;
  */
 @Api(tags = "流程业务关联表")
 @FeignClient(
-        contextId = "supervise-flowable-SysFormLink",
+        contextId = "supervise-system-SysFormLink",
         name = "supervise-flowable",
         path = "v1/sysformlink")
 public interface SysFormLinkFeign {

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/feign/SysProUrlFeign.java

@@ -15,7 +15,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @FeignClient(
-        contextId = "supervise-flowable-SysProUrlFeign",
+        contextId = "supervise-system-SysProUrlFeign",
         name = "supervise-flowable",
         path = "v1/flowable/proUrl")
 public interface SysProUrlFeign {

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java

@@ -157,7 +157,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> getUsersByRoleSid(@Param("roleSid") String roleSid);
 
     List<SysUserVo> getUserByRole(@Param("roleSid") String roleSid, @Param("levelOrgSid") String levelOrgSid);
-
+    List<SysUserVo> getUserByRoleNoOrgPath(@Param("roleSid") String roleSid );
     List<Map<String,String>> getUserByOrgSid(@Param("orgSid") String orgSid,@Param("userSid") String userSid);
 
     List<SysUserVo> fetchBySids(@Param("sids")List<String> sids);

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml

@@ -292,6 +292,14 @@
         and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
         and si.personTypeKey != '01'
     </select>
+    <select id="getUserByRoleNoOrgPath" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
+        select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
+        from sys_user_role sr
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
+        where sr.roleSid = #{roleSid}
+    </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
         SELECT su.sid,

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java

@@ -24,6 +24,7 @@ import com.yxt.supervise.system.sysuser.app.AppUserOrgInfoVo;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -696,6 +697,12 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
         return sysUserService.selectPasswordByUserSid(userSid);
     }
+
+    @Override
+    public ResultBean<List<SysUserVo>> getUserByRoleNoOrgPath(@SpringQueryMap UserQuery userQuery) {
+        return sysUserService.getUserByRoleNoOrgPath(userQuery);
+    }
+
     @GetMapping("getUserByType")
     public ResultBean getUserByType(@RequestParam("userType") String userType){
         return sysUserService.getUserByType(userType);

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -944,7 +944,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     /**
      * 根据员工sid更新用户信息
      *
-     * @param jobNumber 员工编号
      * @param mobile    手机号
      * @param sid       员工sid
      * @return
@@ -997,20 +996,20 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         //把HashSet对象添加至List集合
         l.addAll(set);
         List<Map<String, Object>> r = new ArrayList<>();
-        for (String s : l) {
-            if (StringUtils.isNotBlank(s)) {
+//        for (String s : l) {
+//            if (StringUtils.isNotBlank(s)) {
                 Map<String, Object> m = new HashMap<>();
                 List<SysUserVo> us = new ArrayList<>();
                 for (SysUserVo su : users) {
-                    if (s != null && s.equals(su.getDepartmentName())) {
+                //    if (s != null && s.equals(su.getDepartmentName())) {
                         us.add(su);
-                    }
+                  //  }
                 }
-                m.put("dept", s);
+              //  m.put("dept", s);
                 m.put("users", us);
                 r.add(m);
-            }
-        }
+//            }
+//        }
         ResultBean<Object> objectResultBean = ResultBean.fireSuccess().setData(r);
         return objectResultBean;
     }
@@ -1486,4 +1485,15 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
         return rb.success().setData(users);
     }
+
+    public ResultBean<List<SysUserVo>> getUserByRoleNoOrgPath(UserQuery query) {
+        ResultBean<List<SysUserVo>> rb = ResultBean.fireFail();
+        List<SysUserVo> sysUserVoList = new ArrayList<>();
+        if (StringUtils.isBlank(query.getRoleSid())) {
+            return rb.setMsg("角色sid不能为空");
+        }
+        //根据角色sid获取角色的层级
+                sysUserVoList = baseMapper.getUserByRoleNoOrgPath(query.getRoleSid());
+        return rb.success().setData(sysUserVoList);
+    }
 }