Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -204,7 +204,7 @@ public class SysDeptController {
      * @author qushutong
      * @date 2019/12/13 15:25
      */
-    @GetMapping("getDeptTree")
+    @GetMapping("party/getDeptTree")
     public Result<DeptOption> getDeptTree(){
         return sysDeptService.getDeptTree();
     }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -119,7 +119,7 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<SysDeptEntity> selectListHeadDeptNode(@Param("dataScopeDeptList") List<Long> dataScopeDeptList);
 
     /**
-     * s
+     * 通过数据权限和上级机构列表查询下级机构id列表
      *
      * @param dataScopeDeptList
      * @param parentDeptIdList
@@ -139,8 +139,6 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
 
 
-
-
     /**
      * @author: qushutong
      * @Date: 2019/12/13 14:17

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -423,7 +423,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         // 用于存放 每次组装好的 某一级节点。页面只需展示三级，所以没有存放顶级节点（市区）
         List<JSONArray> cache = Lists.newArrayList();
         Map<String, Object> object;
-        while (CollUtil.isNotEmpty(dataScopeDeptList)) {
+        while (CollUtil.isNotEmpty(dataScopeDeptList) && CollUtil.isNotEmpty(parentDeptIdList)) {
             // 通过上级节点组装所有下级节点
             object = this.packageChildrenNodeArray(parentNodeArray, dataScopeDeptList, parentDeptIdList);
 
@@ -446,7 +446,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
      * @param allParentNode     所有的上级机构节点
      * @param dataScopeDeptList 拥有数据权限的部门
      * @param parentDeptIdList  上级部门id
-     * @return java.util.Map<java.lang.String ,   java.lang.Object>
+     * @return java.util.Map<java.lang.String, java.lang.Object>
      * @author work@yujt.net.cn
      * @date 2019/11/29 10:27
      */
@@ -561,7 +561,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
 
-
     List<DeptTreeDTO> getOtherDept(List<DeptTreeDTO> deptList, JSONArray parent) {
         List<Long> already = Lists.newArrayList();
         for (int i = 0; i < parent.size(); i++) {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java

@@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -215,5 +216,5 @@ public interface GroupFeignClient {
      * @since 2019/11/21 10:35
      */
     @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result joinGridPartyGroup(GroupUserFormDTO formDto);
+    Result joinGridPartyGroup(@RequestBody GroupUserFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.enums.*;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
@@ -95,6 +96,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private GroupTask groupTask;
 
+    @Autowired
+    private GroupFeignClient groupFeignClient;
+
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
     private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png";
 
@@ -295,7 +299,7 @@ public class AppUserServiceImpl implements AppUserService {
         EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value());
 
         // 网格长加入网格党员群并设置为群主
-        this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR);
+        this.joinGridPartyGroup(newAppUser, newAppUser.getGridId(), NumConstant.ONE_STR);
 
         return new Result().ok(authorization);
     }
@@ -723,7 +727,7 @@ public class AppUserServiceImpl implements AppUserService {
             registeredUser = userResult.getUserDTO();
             // 用户已认证为党员，绑定网格时加入该网格党员群
             if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) {
-                this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR);
+                this.joinGridPartyGroup(registeredUser, userResult.getGridId(), NumConstant.ZERO_STR);
             }
         }
 
@@ -830,7 +834,8 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setDeptId(user.getGridId());
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
-            groupTask.updateUserPartyMember(formDto);
+            groupFeignClient.updateUserPartyMember(formDto);
+//            groupTask.updateUserPartyMember(formDto);
         }
 
         return new Result().ok(authorizationDto);
@@ -1005,7 +1010,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author liuchuang
      * @since 2019/11/21 10:58
      */
-    private void joinGridPartyGroup(UserDTO userDto, String lordFlag) {
+    private void joinGridPartyGroup(UserDTO userDto, Long gridId, String lordFlag) {
         GroupUserFormDTO formDto = new GroupUserFormDTO();
         formDto.setUserId(userDto.getId());
         formDto.setNickname(userDto.getNickname());
@@ -1014,8 +1019,9 @@ public class AppUserServiceImpl implements AppUserService {
         formDto.setPartyMember(userDto.getPartyFlag());
         formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
         formDto.setLordFlag(lordFlag);
-        formDto.setGridId(userDto.getGridId());
-        groupTask.joinGridPartyGroup(formDto);
+        formDto.setGridId(gridId);
+        groupFeignClient.joinGridPartyGroup(formDto);
+//        groupTask.joinGridPartyGroup(formDto);
     }
 
     @Override