From ef991e8e2743ca4fc6075c7d8825e15f76033533 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 17 Dec 2019 10:26:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dao/SysDeptDao.java | 12 +++++------- .../esua/epdc/service/impl/SysDeptServiceImpl.java | 11 +++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 7e3cb8b96..d36c03a08 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/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 { List selectListHeadDeptNode(@Param("dataScopeDeptList") List dataScopeDeptList); /** - * s + * 通过数据权限和上级机构列表查询下级机构id列表 * * @param dataScopeDeptList * @param parentDeptIdList @@ -136,15 +136,13 @@ public interface SysDeptDao extends BaseDao { * @Description * @Date 2019/12/4 20:22 **/ - List selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO); - - + List selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO); /** - * @author: qushutong - * @Date: 2019/12/13 14:17 - * @Description: 查询所有 + * @author: qushutong + * @Date: 2019/12/13 14:17 + * @Description: 查询所有 */ List selectListDeptTree(); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 860c58995..08463940a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/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 cache = Lists.newArrayList(); Map 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 + * @return java.util.Map * @author work@yujt.net.cn * @date 2019/11/29 10:27 */ @@ -561,7 +561,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl getOtherDept(List deptList, JSONArray parent) { List already = Lists.newArrayList(); for (int i = 0; i < parent.size(); i++) { @@ -579,10 +578,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl * @author qushutong * @date 2019/12/13 14:50 From 6f292d1121f3f36bf3dff3039f026bb7f5156b73 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Dec 2019 12:31:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/GroupFeignClient.java | 3 ++- .../epdc/service/impl/AppUserServiceImpl.java | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java index 508a64951..6769a96c3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index b756b7cd0..14bbc1539 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/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 From 139f58e5553782930da98657769bb9a999d44e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 17 Dec 2019 13:26:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=96=B0=E5=A2=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/SysDeptController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 030e93db4..9055e761e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/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 getDeptTree(){ return sysDeptService.getDeptTree(); } From bad940aedbb586d6794a02911aa2c68badd5519b Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 17 Dec 2019 17:26:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A=E5=91=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5state=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 737bc13dd..f5095bdbf 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -542,7 +542,7 @@ public class UserServiceImpl extends BaseServiceImpl 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 { From 7094ac9f50f3bc8ad9985bcad77e482c98b3db4c Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 17 Dec 2019 18:59:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 +- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index f5095bdbf..54208a6ff 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -694,7 +694,7 @@ public class UserServiceImpl extends BaseServiceImpl 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 epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 0bd225d9e..6aeb9b54a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/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' - + and EXISTS(select m.USER_ID from epdc_party_authentication_failed m where m.USER_ID=u.id) From 288524f6fc5544437ff48111ec53d406863570e5 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Dec 2019 19:46:15 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- .../dto/constant/GroupNoticeConstant.java | 2 +- .../dto/group/GroupSettingStateDTO.java | 2 ++ .../dto/group/result/TopicAuditRecordResultDTO.java | 2 +- .../src/main/resources/mapper/group/GroupDao.xml | 8 ++++---- .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 1 + 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 14bbc1539..7d7380f38 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -831,7 +831,7 @@ 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()); groupFeignClient.updateUserPartyMember(formDto); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java index 7aae38d97..e1ec2a4c9 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java +++ b/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审核通知 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java index d6bfd00a2..516aabc9c 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java +++ b/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; /** diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java index 4ad0a70f0..201f1f29b 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java +++ b/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; /** * 审核时间 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index a14bcfdd0..17aed5e4d 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/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} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 54208a6ff..937982613 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -589,6 +589,7 @@ public class UserServiceImpl extends BaseServiceImpl implem UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId()); userDto.setLeaderFlag(relationInfo.getLeaderFlag()); + userDto.setFaceImg(oldEntity.getFaceImg()); return new Result().ok(userDto); } From 174dbacfa2e91eb74ad2c38beeb6e73199db9381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 18 Dec 2019 10:14:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 3 ++ .../main/resources/mapper/item/ItemDao.xml | 28 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index da857a386..d27844bb7 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem //修改通知部门Id（街道Id） ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity(); BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto); + itemInfoStreetDto.setId(null); Result result =adminFeignClient.getCompleteDept(entity.getGridId()); CompleteDeptDTO comDeptDto = result.getData(); itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString()); @@ -635,6 +636,7 @@ public class ItemServiceImpl extends BaseServiceImpl 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 implem // 通知部门Id（被吹哨部门） ItemInformationEntity itemInfoEachDto = new ItemInformationEntity(); BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto); + itemInfoEachDto.setId(null); itemInfoEachDto.setDeptId(itemDeptId.toString()); itemInformationService.insert(itemInfoEachDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index a3af458c4..d3bab7632 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -402,26 +402,24 @@ #{deptId} + + AND dept.DEPT_ID = #{gridId} + + + AND dept.DEPT_ID = #{streetId} + + + AND dept.DEPT_ID = #{communityId} + + ) temp ) AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - - AND (item.GRID_ID = #{gridId} - OR find_in_set(#{gridId},item.ALL_DEPT_IDS)) - - - AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) - OR find_in_set(#{streetId},item.ALL_DEPT_IDS)) - - - AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS) - OR find_in_set(#{communityId},item.ALL_DEPT_IDS)) - - - AND item.ITEM_CODE like concat('%', #{itemCode}, '%') - + + AND item.ITEM_CODE like concat('%', #{itemCode}, '%') + ORDER BY item.CREATED_TIME DESC