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

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
@@ -136,15 +136,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Description
      * @Date 2019/12/4 20:22
      **/
-	List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
-
-
+    List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
 
 
     /**
-     *  @author: qushutong
-     *  @Date: 2019/12/13 14:17
-     *  @Description: 查询所有
+     * @author: qushutong
+     * @Date: 2019/12/13 14:17
+     * @Description: 查询所有
      */
     List<DeptTreeDTO> selectListDeptTree();
 }

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++) {
@@ -579,10 +578,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return others;
     }
 
-    
+
     /***
-     * 
-     * @param  
+     *
+     * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      * @author qushutong
      * @date 2019/12/13 14:50

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -106,6 +106,7 @@ public class ApiAppUserController {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.checkRegister(formDto);
     }
+
     /**
      * 用户生成小程序码
      *
@@ -127,6 +128,7 @@ public class ApiAppUserController {
      * @author yujintao
      * @date 2019/9/9 10:52
      */
+    @Deprecated
     @GetMapping("user/mp/getToken")
     public Result<EpdcAppAuthorizationDTO> getToken(EpdcAppUserTokenFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
@@ -241,6 +243,7 @@ public class ApiAppUserController {
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }
+
     /**
      * 获取邀请记录
      *

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/feign/UserFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
@@ -186,7 +187,7 @@ public interface UserFeignClient {
      * 获取网格长管理的网格列表
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List               <               com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:34
      */
@@ -237,11 +238,10 @@ public interface UserFeignClient {
     Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
 
     /**
-     *
      * 获取用户最后一次切换的网格信息
      *
-     * @params [openId]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @params [openId]
      * @author liuchuang
      * @since 2019/12/6 11:04
      */
@@ -305,12 +305,12 @@ public interface UserFeignClient {
      * @Date 2019/11/22 14:22
      **/
     @PostMapping("app-user/epdc-app/usergrid/removeGrid")
-	Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
+    Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 
     /**
      * 获取邀请记录
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.UserInvitationRecordResultDTO              <               com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.UserInvitationRecordResultDTO < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:34
      */
@@ -324,6 +324,17 @@ public interface UserFeignClient {
      * @Description 根据openId或者unionId查询用户信息
      * @Date 2019/12/7 14:11
      **/
-    @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
+
+    /**
+     * 需要缓存的用户信息
+     *
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @author rongchao
+     * @since 2019-12-18
+     */
+    @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
 }

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
@@ -150,6 +151,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "removeGrid", formDto);
     }
+
     @Override
     public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord");
@@ -157,6 +159,11 @@ public class UserFeignClientFallback implements UserFeignClient {
 
     @Override
     public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto", formDTO);
+    }
+
+    @Override
+    public Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", 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;
@@ -83,6 +84,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Autowired
     private JwtTokenProperties jwtTokenProperties;
+    
     @Autowired
     private OssFeignClient ossFeignClient;
 
@@ -95,6 +97,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";
 
@@ -200,7 +205,7 @@ public class AppUserServiceImpl implements AppUserService {
         EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO();
         formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
         formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
-        Result<UserDTO> userInfoResult = userFeignClient.queryUserDto(formDTO);
+        Result<CachingUserInfoDTO> userInfoResult = userFeignClient.needCachingUserInfo(formDTO);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
         }
@@ -215,7 +220,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:17
      */
-    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(UserDTO userDto) {
+    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto) {
 
         EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO();
         // 用户未注册
@@ -227,7 +232,7 @@ public class AppUserServiceImpl implements AppUserService {
         tokenDto.setUserId(userDto.getId());
 
         String state = userDto.getState();
-        authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), userDto.getState());
+        authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state);
 
         Result result = new Result().ok(authorization);
         // 已注册，未完善信息
@@ -295,7 +300,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 +728,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);
             }
         }
 
@@ -816,7 +821,7 @@ public class AppUserServiceImpl implements AppUserService {
         tokenDto.setRealName(user.getRealName());
         tokenDto.setNickname(user.getNickname());
         tokenDto.setMobile(user.getMobile());
-        tokenDto.setPartyFlag(user.getPartyFlag());
+//        tokenDto.setPartyFlag(user.getPartyFlag());
         EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState());
 
         // 更新社群用户党员标识并加入关联的所有网格党员群
@@ -827,10 +832,11 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setNickname(user.getNickname());
             formDto.setUserAvatar(user.getFaceImg());
             formDto.setMobile(user.getMobile());
-            formDto.setDeptId(user.getGridId());
+            formDto.setDeptId(user.getDeptId());
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
-            groupTask.updateUserPartyMember(formDto);
+            groupFeignClient.updateUserPartyMember(formDto);
+//            groupTask.updateUserPartyMember(formDto);
         }
 
         return new Result().ok(authorizationDto);
@@ -843,7 +849,7 @@ public class AppUserServiceImpl implements AppUserService {
         if (result.success() && null != result.getData()) {
             EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class);
             if (("0").equals(result.getData().getState())) {
-	            dto.setGridId(tokenDto.getGridId());
+                dto.setGridId(tokenDto.getGridId());
                 //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端
                 Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(dto.getGridId());
                 if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) {
@@ -967,7 +973,7 @@ public class AppUserServiceImpl implements AppUserService {
         tokenDto.setUserId(userDetail.getUserId());
         tokenDto.setGridId(userDetail.getGridId());
         tokenDto.setMobile(userDetail.getMobile());
-        tokenDto.setPartyFlag(userDetail.getPartyFlag());
+//        tokenDto.setPartyFlag(userDetail.getPartyFlag());
         tokenDto.setRealName(userDetail.getRealName());
         long expire = cpUserDetailRedis.getExpire(userDetail.getUserId());
         cpUserDetailRedis.logout(userDetail.getUserId());
@@ -1005,7 +1011,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 +1020,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

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -611,6 +611,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     //修改通知部门Id（街道Id）
                     ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto);
+                    itemInfoStreetDto.setId(null);
                     Result<CompleteDeptDTO>  result =adminFeignClient.getCompleteDept(entity.getGridId());
                     CompleteDeptDTO comDeptDto = result.getData();
                     itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString());
@@ -635,6 +636,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDto.getDeptId().toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }
@@ -647,6 +649,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDeptId.toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -402,26 +402,24 @@
                     #{deptId}
                 </foreach>
             </if>
+        <if test="gridId != null and gridId != ''">
+            AND dept.DEPT_ID = #{gridId}
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND dept.DEPT_ID = #{streetId}
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND dept.DEPT_ID = #{communityId}
+        </if>
+
                  ) temp
             )
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
-            <if test="gridId != null and gridId != ''">
-                AND (item.GRID_ID = #{gridId}
-                OR find_in_set(#{gridId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="streetId != null and streetId != ''">
-                AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="communityId != null and communityId != ''">
-                AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="itemCode != null and itemCode != ''">
-                AND item.ITEM_CODE like concat('%', #{itemCode}, '%')
-            </if>
+        <if test="itemCode != null and itemCode != ''">
+            AND item.ITEM_CODE like concat('%', #{itemCode}, '%')
+        </if>
         ORDER BY
             item.CREATED_TIME DESC
     </select>

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java

@@ -87,7 +87,7 @@ public interface GroupNoticeConstant {
     /**
      * 转议题-通过-内容-发布话题用户
      */
-    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在 党群议事查看。";
+    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在党群议事查看。";
 
     /**
      * 我的消息类型：0审核通知

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -32,6 +33,7 @@ public class GroupSettingStateDTO implements Serializable {
     /**
      * 处理意见
      */
+    @Size(min = 0, max = 500, message = "处理意见在500字以内")
     private String processingOpinions;
 
     /**

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java

@@ -24,7 +24,7 @@ public class TopicAuditRecordResultDTO implements Serializable {
     /**
      * 处理意见
      */
-    private String processionOpinions;
+    private String processingOpinions;
 
     /**
      * 审核时间

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -147,10 +147,7 @@
             ugp1.NICKNAME,
             ugp2.LORD_FLAG,
             COUNT( DISTINCT tp.ID ) AS topicNum,
-        CASE
-                WHEN SUM( tp.STATE = 10 OR tp.STATE = 15 ) IS NULL THEN
-                0 ELSE SUM( tp.STATE = 10 OR tp.STATE = 15 )
-            END AS changeToIssueNum
+            COUNT( DISTINCT tp1.ID ) AS changeToIssueNum
         FROM
             epdc_group gp
             LEFT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID
@@ -166,6 +163,9 @@
             AND ugp2.USER_ID = #{userId}
             LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID
             AND tp.DEL_FLAG = '0'
+            LEFT JOIN epdc_topic tp1 ON gp.ID = tp1.GROUP_ID
+            AND tp1.DEL_FLAG = '0'
+			AND (tp1.STATE = 10 OR tp1.STATE = 15)
         WHERE
             gp.DEL_FLAG = '0'
             AND gp.ID = #{id}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -544,7 +544,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
-                userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
                 userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是)  认证失败：0
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
             } else {
@@ -597,6 +597,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
+        userDto.setFaceImg(oldEntity.getFaceImg());
         return new Result().ok(userDto);
     }
 
@@ -702,7 +703,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         // 查询认证失败的党员
         if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
-            state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
+            state = AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value();
             workUserFromDto.setAuthenticatedFlag(state);
             workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value());
             List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -330,7 +330,7 @@
         LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE u.DEL_FLAG = '0'
         AND ug.DEL_FLAG = '0'
-        <if test="partyFlag ='0' and authenticatedFlag ='2'">
+        <if test="partyFlag ='0' and authenticatedFlag ='1'">
             and EXISTS(select m.USER_ID
             from epdc_party_authentication_failed m
             where m.USER_ID=u.id)