网格长相关bug

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

@@ -283,7 +283,12 @@ public class AppUserServiceImpl implements AppUserService {
         // 组装用户注册信息
         EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode());
         List<UserGridRelationDTO> userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class);
-
+        for(UserGridRelationDTO item: userGridList){
+            item.setAllDeptNames(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()+"-"+item.getGrid());
+            item.setAllDeptIds(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()+","+item.getGridId());
+            item.setParentDeptIds(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity());
+            item.setParentDeptNames(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId());
+        }
         EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO();
         registerDto.setGridLeader(gridLeaderRegister);
         registerDto.setUserGridList(userGridList);

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

@@ -329,7 +329,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO existUser = selectUserByWxInfo(gridLeader.getWxOpenId(), gridLeader.getWxUnionId());
         String userId;
         String faceImg = userEntity.getFaceImg();
-
+        userEntity.setLastLoginTime(new Date());
         // 首次注册
         if (null == existUser) {
 
@@ -573,12 +573,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userAuthenticateHistoryEntity.setRealName(userDto.getRealName());
             userAuthenticateHistoryEntity.setAddress(userDto.getAddress());
             userAuthenticateHistoryEntity.setRemark(userDto.getRemark());
-            userAuthenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.partyAuth); // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证)
+            // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证)
+            userAuthenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.partyAuth);
             userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity);
         } else {
-            if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) {
                 userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
-            }
         }
         // 昵称前缀
         String nicknamePrefix = "网格长-";