修改组织机构禁用接口

jyzb-biz/src/main/java/com/junmp/jyzb/controller/LoginController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.junmp.jyzb.api.constant.JYZBConstant;
 import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.doc.LoginDoc;
+import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.v2.auth.api.bean.auth.LoginReq;
 import com.junmp.v2.auth.api.bean.auth.LoginRes;
 import com.junmp.v2.auth.sign.AuthContainer;
@@ -42,8 +43,10 @@ public class LoginController implements LoginDoc {
     private MsgRedisCache goldRedisCache ;
 
 
+
     @PostMapping(name = "用户登录", path = "/auth/login")
     public ApiRes<LoginRes> login(@RequestBody LoginReq req) {
+
         LoginRes res = authContainer.login(req);
         if (null != res) {
             //配置扩展信息

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java

@@ -81,9 +81,9 @@ public class PublicController {
 
     //上传人脸照片
     @PostMapping("/uploadPolicePhoto")
-    public UploadPolicePhotoDto uploadPolicePhoto(@RequestPart("picture") MultipartFile picture, UploadPolicePhotoReq req) {
+    public ApiRes<UploadPolicePhotoDto> uploadPolicePhoto(@RequestPart("picture") MultipartFile picture, UploadPolicePhotoReq req) {
 
-        return policemanService.uploadPolicePhoto(picture,req);
+        return ApiRes.success(policemanService.uploadPolicePhoto(picture,req));
     }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PubOrgMapper.java

@@ -22,4 +22,6 @@ public interface PubOrgMapper extends BaseMapper<PubOrg> {
     List<TjOrgEqsDto> getDownOrg(@Param("orgId") Long orgId);
     //查询下一级（除了下n级）
     List<TjOrgEqsDto> getLowOrg(@Param("orgId") Long orgId);
+
+    boolean setAllUserState(@Param("orgIds") List<Long> collect);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -55,8 +55,10 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
     private RedisUtils redisUtils;
     @Autowired
     private PubOrgRepository pubOrgRepository;
+
     private List<OrgDto> OrgDto;
     private ArrayList<String> ids;
+
     //例：传入abc,OrderMQReceiver ==>bc 删掉开头的字符串，不是就不删除
     public static String removePrefix(String name, String deleteName) {
         if (name.startsWith(deleteName)) {
@@ -258,6 +260,9 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
                 p.setDelFlag(req.getDelFlag());
 
             });
+            List<Long> collect = st.stream().map(PubOrg::getOrgId).collect(Collectors.toList());
+            //将组织机构下的所有账号的状态设置成启用或者禁用
+            boolean b=pubOrgMapper.setAllUserState(collect);
            return   this.updateBatchById(st);
         }
         else

jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml

@@ -262,8 +262,8 @@ WHERE o.org_id IN
                 left join base_policeman p on p.user_id=su.user_id and p.org_id_int=#{orgId}
                 GROUP BY su.user_id
             ) as a
-            JOIN sys_user_role sur on a.user_id=sur.user_id
-            join sys_role sr on sr.role_id=sur.role_id
+            left JOIN sys_user_role sur on a.user_id=sur.user_id
+            left join sys_role sr on sr.role_id=sur.role_id
             <if test="roleCodeList != null and roleCodeList.size()>0">
                 and
                 <foreach collection="roleCodeList" item="item" open="(" separator="or" close=")">

jyzb-biz/src/main/resources/mapper/PubOrgMapper.xml

@@ -72,6 +72,10 @@ UPDATE pub_org p
 JOIN cte ON p.org_id = cte.org_id
 SET p.org_parent_ids = cte.org_parent_ids;
     </update>
+    <update id="setAllUserState" >
+
+    </update>
+
 
     <select id="getOrgDetail" resultType="Map">
         select