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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java

@@ -48,8 +48,4 @@ public class MyselfMsgResultDTO implements Serializable {
      */
     private  String volunteerFlag;
 
-    /**
-     * 类别【字典表】
-     */
-    private String volunteerCategory;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -171,7 +171,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 }*/
 
 
-
         baseInfo.setUserId(wxUserInfoFormDTO.getUserId());
         baseInfo.setNickname(wxUserInfoFormDTO.getNickName());
         baseInfo.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl());
@@ -181,7 +180,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     /**
-     *
      * @Description 查询用户注册时间
      * @param: formDTO
      * @Author zxc
@@ -195,15 +193,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     /**
-     * @Description 居民端获取个人信息
      * @param myResiUserInfoFormDTO
      * @return MyResiUserInfoResultDTO
+     * @Description 居民端获取个人信息
      * @author wangc
      * @date 2020.05.22 19:24
      **/
     @Override
     public MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO) {
         MyselfMsgResultDTO myselfMsg = baseDao.getMyselfMsg(myResiUserInfoFormDTO.getUserId());
+        Result<VolunteerInfoDTO> volun = epmetHeartOpenFeignClient.queryUserVolunteerInfo(myResiUserInfoFormDTO.getUserId());
+        if (volun.success() && null != volun.getData()) {
+            myselfMsg.setVolunteerFlag("1");//志愿者
+        } else {
+            myselfMsg.setVolunteerFlag("0");
+        }
+
         if (null != myselfMsg) {
             MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class);
             //registerFlag 是否已注册居民，true ,false
@@ -481,7 +486,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         LambdaUpdateWrapper<ResiUserBadgeEntity> badgeUpdate = new LambdaUpdateWrapper<>();
         badgeUpdate.set(ResiUserBadgeEntity::getGridId, newGridInfo.getId())
                 .set(ResiUserBadgeEntity::getUpdatedBy, formDTO.getUserId())
-                .set(ResiUserBadgeEntity::getUpdatedTime,new Date());;
+                .set(ResiUserBadgeEntity::getUpdatedTime, new Date());
+        ;
         badgeUpdate.eq(ResiUserBadgeEntity::getCustomerId, formDTO.getCustomerId())
                 .eq(ResiUserBadgeEntity::getUserId, formDTO.getUserId());
         resiUserBadgeDao.update(null, badgeUpdate);

epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@@ -35,9 +35,7 @@
             IFNULL(resi.ID,"") AS resiId,
             IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
             IFNULL(relation.GRID_ID,"") AS gridId,
-            IFNULL(resi.id_num,'')AS idNum,
-            IF(iv.id is null,'0','1') as volunteerFlag,
-            iv.VOLUNTEER_CATEGORY
+            IFNULL(resi.id_num,'')AS idNum
             FROM
             USER user
             LEFT JOIN
@@ -48,8 +46,6 @@
             REGISTER_RELATION relation ON user.ID = relation.USER_ID
             AND relation.DEL_FLAG = '0'
             AND relation.FIRST_REGISTER = '1'
-            LEFT JOIN ic_resi_user ru on ru.ID_CARD=wechat.ID_NUM and ru.DEL_FLAG=0
-			LEFT JOIN ic_volunteer iv ON iv.IC_RESI_USER=ru.id and iv.DEL_FLAG=0
             WHERE
             user.ID = #{userId}
             AND