From ba44f8c706f1472cfbb0ebdc669e82379f59d1cd Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 24 Sep 2019 09:56:51 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=EF=BC=8C=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/issue/IssueContentDetailDTO.java | 4 ++ .../dto/issue/IssueWaitHandleDetailDTO.java | 4 ++ .../result/ItemContentForPCEndResultDTO.java | 4 ++ .../main/resources/mapper/issue/IssueDao.xml | 39 ++++++++++++++----- .../main/resources/mapper/item/ItemDao.xml | 20 +++++++++- 5 files changed, 60 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java index b84985206..2cd99c51d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java @@ -39,6 +39,10 @@ public class IssueContentDetailDTO implements Serializable { * 评论数 */ private Integer commentNum; + /** + * 图片 + */ + private List images; /** * 工作反馈或处理进度 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java index 760daf9ff..cfbf08d7e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java @@ -31,6 +31,10 @@ public class IssueWaitHandleDetailDTO implements Serializable { * 议题内容 */ private String issueContent; + /** + * 图片 + */ + private List images; /** * 工作反馈 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java index 8baa04907..a77c98fc7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java @@ -47,4 +47,8 @@ public class ItemContentForPCEndResultDTO implements Serializable { * 项目处理进度 */ private List handleProgressResultDTOS; + /** + * 图片 + */ + private List images; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 2833e3a13..b48a209a5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -41,6 +41,9 @@ + + + @@ -64,32 +67,50 @@ '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' - END) AS stateName + END) AS stateName, + img.IMG_URL FROM epdc_issue i LEFT JOIN epdc_issue_handle h ON i.ID = h.ISSUE_ID AND h.DEL_FLAG = '0' + LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID + AND img.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' AND i.ID = #{id} - ORDER BY h.CREATED_TIME DESC + ORDER BY h.CREATED_TIME, img.CREATED_TIME DESC - SELECT - i.NICK_NAME AS nickName, - i.DISTRIBUTE_TIME AS distributeTime, - i.ISSUE_CONTENT AS issueContent, - e.APPROVE_NUM AS approveNum, - e.OPPOSE_NUM AS opposeNum, - e.COMMENT_NUM AS commentNum + i.NICK_NAME, + i.DISTRIBUTE_TIME, + i.ISSUE_CONTENT, + e.APPROVE_NUM, + e.OPPOSE_NUM, + e.COMMENT_NUM, + img.IMG_URL FROM epdc_issue i LEFT JOIN epdc_events e ON i.EVENT_ID = e.ID AND e.DEL_FLAG = '0' + LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID + AND img.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' AND i.ID = #{issueId} + ORDER BY img.CREATED_TIME - SELECT item.ID, item.NICK_NAME, @@ -337,13 +349,17 @@ item.ITEM_CONTENT, eve.APPROVE_NUM, eve.OPPOSE_NUM, - eve.COMMENT_NUM + eve.COMMENT_NUM, + img.IMG_URL FROM epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' + LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID + AND img.DEL_FLAG = '0' WHERE item.DEL_FLAG = '0' AND item.ID = #{itemId} + ORDER BY img.CREATED_TIME From 2977d91ff6493c97254aa1c58dc4e3f95bfac731 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 24 Sep 2019 11:08:31 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=EF=BC=9B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=8E?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/InformationDao.xml | 4 +- .../com/elink/esua/epdc/excel/UserExcel.java | 103 ++++++------------ .../epdc/service/impl/UserServiceImpl.java | 4 +- 3 files changed, 39 insertions(+), 72 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml index f01290303..be8924cb3 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml @@ -15,7 +15,7 @@ im.BUSINESS_ID, im.BUSINESS_TYPE, im.REL_BUSINESS_CONTENT, - DATE_FORMAT( im.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) AS `time` + im.CREATED_TIME AS `time` FROM epdc_information im WHERE @@ -23,7 +23,7 @@ AND im.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' ) AND im.DEL_FLAG= '0' ORDER BY - im.READ_FLAG DESC, im.CREATED_TIME DESC + im.READ_FLAG ASC, im.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java index ea5990a00..c325257ea 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java @@ -30,81 +30,50 @@ import java.util.Date; */ @Data public class UserExcel { - @Excel(name = "主键") - private String id; - @Excel(name = "昵称") - private String nickname; - @Excel(name = "手机号") - private String mobile; - @Excel(name = "密码") - private String password; - @Excel(name = "注册时间") - private Date registerTime; - @Excel(name = "头像") - private String faceImg; - @Excel(name = "性别(女性-female，男性-male)") - private String sex; - @Excel(name = "生日") - private Date birthday; - @Excel(name = "邮箱") - private String email; - @Excel(name = "电话") - private String telephone; - @Excel(name = "邮编") - private String zipCode; - @Excel(name = "职业") - private String profession; - @Excel(name = "爱好") - private String hobbies; - @Excel(name = "个性签名") - private String userSign; - @Excel(name = "邀请码") - private String invitationCode; - @Excel(name = "最近登录时间") - private Date lastLoginTime; - @Excel(name = "最近登录IP") - private String lastLoginIp; - @Excel(name = "最近登录位置经度") - private String lastLongitude; - @Excel(name = "最近登录位置维度") - private String lastLatitude; + @Excel(name = "真实姓名") private String realName; + @Excel(name = "身份证号") private String identityNo; + + @Excel(name = "是否党员", replace = {"是_1", "否_0"}) + private String partyFlag; + + @Excel(name = "手机号") + private String mobile; + + @Excel(name = "街道") + private String street; + + @Excel(name = "社区") + private String community; + + @Excel(name = "网格") + private String grid; + @Excel(name = "居民住址") private String address; - @Excel(name = "微信OPENID") - private String wxOpenId; - @Excel(name = "是否是党员(0-否，1-是)") - private String partyFlag; - @Excel(name = "注册方式（wx：微信注册）") - private String registerWay; - @Excel(name = "用户来源(wp:公众号)") - private String registerSource; + + @Excel(name = "昵称") + private String nickname; + + @Excel(name = "性别", replace = {"男_1", "女_0", "保密_2"}) + private String sex; + + @Excel(name = "生日", format = "yyyy-MM-dd") + private Date birthday; + + @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss") + private Date registerTime; + @Excel(name = "手机号所属省份") - private String phoneProvince; + private String mobileProvince; + @Excel(name = "手机号所属城市") - private String phoneCity; + private String mobileCity; + @Excel(name = "手机号所属运营商") - private String phoneCarrier; - @Excel(name = "用户积分") - private Integer points; - @Excel(name = "邀请人ID") - private String inviteUserId; - @Excel(name = "乐观锁") - private Integer revision; - @Excel(name = "网格ID") - private String gridId; - @Excel(name = "创建人") - private String createdBy; - @Excel(name = "创建时间") - private Date createdTime; - @Excel(name = "更新人") - private String updatedBy; - @Excel(name = "更新时间") - private Date updatedTime; - @Excel(name = "删除标记") - private String delFlag; + private String mobileCarrier; } \ No newline at end of file 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 f68c33ab2..26c25a2a5 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 @@ -33,8 +33,6 @@ import com.elink.esua.epdc.dao.UserDao; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.entity.UserEntity; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; @@ -109,7 +107,7 @@ public class UserServiceImpl extends BaseServiceImpl implem wrapper.ge(StringUtils.isNotBlank(startTime), "REGISTER_TIME", startTime); wrapper.lt(StringUtils.isNotBlank(endTime), "REGISTER_TIME", endTime); wrapper.eq(StringUtils.isNotBlank(auditState), FieldConstant.STATE, auditState); - wrapper.in(CollUtil.isNotEmpty(deptIdList), "GRID_ID", deptIdList); + wrapper.in(CollUtil.isNotEmpty(deptIdList), FieldConstant.GRID_ID, deptIdList); wrapper.eq(StringUtils.isNotBlank(isParty), "PARTY_FLAG", isParty); return wrapper; } From cd691aa5b0f03b8c52a2d1cb0e9e71c5b837d06e Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 24 Sep 2019 13:23:01 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/doc/db/newupdate.sql | 3 +++ .../src/main/java/com/elink/esua/epdc/dto/UserDTO.java | 5 +++++ .../src/main/java/com/elink/esua/epdc/entity/UserEntity.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/esua-epdc/doc/db/newupdate.sql b/esua-epdc/doc/db/newupdate.sql index 0df7bd456..0ac010038 100644 --- a/esua-epdc/doc/db/newupdate.sql +++ b/esua-epdc/doc/db/newupdate.sql @@ -3,3 +3,6 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机 ------------- 2019-09-20 部门编码-------------------- ALTER TABLE sys_dept ADD party_code varchar(50) + +------------- 2019-09-24 -------------------- +ALTER TABLE epdc_user ADD REMARK VARCHAR(50) NULL COMMENT '审核备注' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index 9cc7fd674..98c08fd56 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java @@ -307,4 +307,9 @@ public class UserDTO implements Serializable { */ private String tagIds; + /** + * 审核备注 + */ + private String remark; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java index 85e2066bd..3ceefb8b9 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java @@ -263,5 +263,10 @@ public class UserEntity extends BaseEpdcEntity { */ private String firstName; + /** + * 审核备注 + */ + private String remark; + } \ No newline at end of file From 5a65c252ebb7b0a9ccd75a62ab03d246f0b5cfaa Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 24 Sep 2019 13:29:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/doc/db/newupdate.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/doc/db/newupdate.sql b/esua-epdc/doc/db/newupdate.sql index 0ac010038..72631d3f1 100644 --- a/esua-epdc/doc/db/newupdate.sql +++ b/esua-epdc/doc/db/newupdate.sql @@ -5,4 +5,4 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机 ALTER TABLE sys_dept ADD party_code varchar(50) ------------- 2019-09-24 -------------------- -ALTER TABLE epdc_user ADD REMARK VARCHAR(50) NULL COMMENT '审核备注' +ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注' From f5aa804829700428a15eed51f99a95f9e6355508 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 24 Sep 2019 14:19:04 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/UserFeignClient.java | 13 ++++++- .../fallback/UserFeignClientFallback.java | 5 +++ .../epdc/service/impl/AppUserServiceImpl.java | 37 ++++++++++--------- .../controller/EpdcAppUserController.java | 13 +++++++ .../esua/epdc/controller/UserController.java | 2 - .../elink/esua/epdc/service/UserService.java | 12 +++++- .../epdc/service/impl/UserServiceImpl.java | 12 ++++++ 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index b5aeff34d..a74ad2f0a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody; public interface UserFeignClient { /** - * 获取用户信息 + * 获取用户信息(注册用) * * @param openId * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -34,6 +34,17 @@ public interface UserFeignClient { @GetMapping("app-user/epdc-app/user/getByOpenId/{openId}") Result getUserInfoByOpenId(@PathVariable("openId") String openId); + /** + * 获取用户信息（登录用） + * + * @param openId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/20 18:43 + */ + @GetMapping("app-user/epdc-app/user/getForLogin/{openId}") + Result getUserForLoginByOpenId(@PathVariable("openId") String openId); + /** * 获取用户信息 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 05a91417e..5d21d3dea 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -22,6 +22,11 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByOpenId", openId); } + @Override + public Result getUserForLoginByOpenId(String openId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserForLoginByOpenId", openId); + } + @Override public Result getUserInfoByUnionId(String unionId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByUnionId", unionId); 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 8e61a8133..41efc2793 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 @@ -98,7 +98,7 @@ public class AppUserServiceImpl implements AppUserService { */ private Result getTokenByUnionId(String unionId) { // 查询当前微信是否已注册用户 - Result userInfoResult = userFeignClient.getUserInfoByUnionId(unionId); + Result userInfoResult = userFeignClient.getUserForLoginByOpenId(unionId); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); } @@ -115,7 +115,7 @@ public class AppUserServiceImpl implements AppUserService { */ private Result getTokenByOpenId(String openId) { // 查询当前微信是否已注册用户 - Result userInfoResult = userFeignClient.getUserInfoByOpenId(openId); + Result userInfoResult = userFeignClient.getUserForLoginByOpenId(openId); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); } @@ -139,11 +139,22 @@ public class AppUserServiceImpl implements AppUserService { return new Result().ok(authorization); } String state = userDto.getState(); - String userId = userDto.getId(); - TokenDto tokenInfo = tokenUtil.getTokenInfo(userId); - - // 用户已注册且审核通过，可以正常登录系统 - if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) { + // 用户注册审核失败 + if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(state)) { + authorization.setUserState(AppUserStateEnum.AUDIT_FAILURE.value()); + Result result = new Result().ok(authorization); + result.setMsg(userDto.getRemark()); + return result; + } + // 用户提交注册、正在等待审核 + else if (AppUserAuditStateEnum.UNDER_AUDIT.value().equals(state)) { + authorization.setUserState(AppUserStateEnum.UNDER_AUDIT.value()); + return new Result().ok(authorization); + } + // 用户已注册且审核通过，正常登录系统 + else if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) { + String userId = userDto.getId(); + TokenDto tokenInfo = tokenUtil.getTokenInfo(userId); // 生成token String token = jwtTokenUtils.generateToken(userId); Long expire; @@ -154,7 +165,6 @@ public class AppUserServiceImpl implements AppUserService { } else { expire = (long) jwtTokenProperties.getExpire(); } - TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class); tokenDto.setUserId(userId); cpUserDetailRedis.set(tokenDto, expire); @@ -164,16 +174,9 @@ public class AppUserServiceImpl implements AppUserService { authorization.setUserId(userId); authorization.setExpire(expire); return new Result().ok(authorization); + } else { + return new Result().error("Login failed"); } - - // 用户提交注册、正在等待审核或审核失败 - if (AppUserAuditStateEnum.UNDER_AUDIT.value().equals(state)) { - authorization.setUserState(AppUserStateEnum.UNDER_AUDIT.value()); - } else if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(state)) { - authorization.setUserState(AppUserStateEnum.AUDIT_FAILURE.value()); - } - return new Result().ok(authorization); - } @Override diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 67d3e7316..13f10c623 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -36,6 +36,19 @@ public class EpdcAppUserController { return userService.getUserInfoByOpenId(openId); } + /** + * 登录前，获取用户信息 + * + * @param openId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/24 13:57 + */ + @GetMapping("getForLogin/{openId}") + public Result getUserForLoginByOpenId(@PathVariable("openId") String openId) { + return userService.getUserForLoginByOpenId(openId); + } + /** * 根据用户unionId获取用户信息(只查询已注册或审核中的用户) * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index b79fd03d5..64fe569f1 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -17,7 +17,6 @@ package com.elink.esua.epdc.controller; -import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -29,7 +28,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.excel.UserExcel; import com.elink.esua.epdc.service.UserService; -import io.seata.spring.annotation.GlobalTransactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index a73760b89..5893553c2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -22,8 +22,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.entity.UserEntity; @@ -114,4 +112,14 @@ public interface UserService extends BaseService { * @date 2019/9/21 11:04 */ Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto); + + /** + * 登录前，获取用户信息 + * + * @param openId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/24 13:57 + */ + Result getUserForLoginByOpenId(String openId); } \ No newline at end of file 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 26c25a2a5..f1a86c52c 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 @@ -170,9 +170,21 @@ public class UserServiceImpl extends BaseServiceImpl implem baseDao.deleteByUnionId(wxUnionId); } + @Override + public Result getUserForLoginByOpenId(String openId) { + QueryWrapper wrapper = new QueryWrapper<>(); + // 根据openId获取已提交注册的用户信息 + wrapper.eq("WX_OPEN_ID", openId) + .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME", + FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG", "REMARK"); + UserEntity userEntity = this.baseDao.selectOne(wrapper); + return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class)); + } + @Override public Result getUserInfoByOpenId(String openId) { QueryWrapper wrapper = new QueryWrapper<>(); + // 根据openId查询审核中或审核通过的用户信息 wrapper.eq("WX_OPEN_ID", openId) .ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value()) .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME", From b9ee0fed3a64f0b0e184617796082b66e0605270 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 24 Sep 2019 14:34:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java | 3 ++- .../epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java | 4 ++-- .../elink/esua/epdc/dto/item/form/EvaluationFormDTO.java | 5 ++--- .../esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java | 5 +++-- .../epdc/modules/item/controller/EpdcAppItemController.java | 1 + .../src/main/resources/mapper/events/EpdcEventsDao.xml | 6 ++++++ .../src/main/resources/mapper/item/ItemDao.xml | 2 ++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 4d3876951..0aac98d74 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.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,6 @@ public class EpdcEventsReviewFormDTO implements Serializable { /** * 处理意见 */ - @NotBlank(message = "处理意见不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String advice; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index f0d8c71ae..7dd250191 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java @@ -2,8 +2,8 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -22,7 +22,7 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable { /** * 处理意见 */ - @NotBlank(message = "处理意见不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String advice; /** * 状态 1 添加处理意见，2 关闭，4 转项目 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java index ae39db883..c1d86798c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java @@ -2,10 +2,9 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.Date; /** * @Author LC @@ -21,7 +20,7 @@ public class EvaluationFormDTO implements Serializable { @NotBlank(message = "满意度评价得分不能为空") private int evaluationScore; - @NotBlank(message = "满意度评价内容不能为空") + @Size(min = 1, max = 100, message = "满意度评价内容在100字以内") private String evaluationContent; private String userId; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index 1e6561fd0..91290c199 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -27,13 +28,13 @@ public class ItemHandleSubmitFormDTO implements Serializable { /** * 处理意见（内部） */ - @NotBlank(message = "处理意见（内部）不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String handleAdvice; /** * 处理意见（外部） */ - @NotBlank(message = "处理意见（外部）不能为空") + @Size(min = 1, max = 500, message = "处理意见在500字以内") private String outHandleAdvice; /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 3f76d3002..20b8d53b1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -54,6 +54,7 @@ public class EpdcAppItemController { @PostMapping("evaluation") public Result evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { + ValidatorUtils.validateEntity(evaluationFormDTO); return this.itemService.evaluation(evaluationFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 733313b1f..c89b3c223 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -73,6 +73,12 @@ AND temp.grid_id = #{gridId} + + AND temp.STREET_ID = #{streetId} + + + AND temp.COMMUNITY_ID = #{communityId} + AND temp.EVENT_STATE = 2 ORDER BY temp.CREATED_TIME DESC 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 d049cedd8..c513d5ab0 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 @@ -301,6 +301,7 @@ OUT_HANDLE_ADVICE AS advice, + HANDLER_DEPT AS handlerDept, CASE WHEN STATE = 0 THEN '【处理中】' WHEN STATE = 5 THEN '【已关闭】' WHEN STATE = 10 THEN '【已结案】' ELSE '' END AS progressName FROM epdc_item_handle_process @@ -310,6 +311,7 @@ SELECT EVALUATION_TIME AS createdTime, EVALUATION_CONTENT AS advice, + NICK_NAME AS handlerDept, CASE EVALUATION_SCORE WHEN 0 THEN From 037e6f9d7e3ae4534fb0b69901c83f187a735227 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 24 Sep 2019 14:50:22 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=A0=E9=99=A4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysDictServiceImpl.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java index c98e332e1..b3f79c64a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -10,12 +10,10 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SysDictDao; import com.elink.esua.epdc.dto.SysDictDTO; @@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -48,12 +47,10 @@ public class SysDictServiceImpl extends BaseServiceImpl page(Map params) { - QueryWrapper wrapper = getWrapper(params); - wrapper.eq("pid", Constant.DICT_ROOT); IPage page = baseDao.selectPage( - getPage(params, "sort", true), - wrapper + getPage(params, "sort", true), + getWrapper(params) ); return getPageData(page, SysDictDTO.class); @@ -72,14 +69,13 @@ public class SysDictServiceImpl extends BaseServiceImpl getWrapper(Map params){ + private QueryWrapper getWrapper(Map params) { String pid = (String) params.get("pid"); String dictType = (String) params.get("dictType"); String dictName = (String) params.get("dictName"); String dictValue = (String) params.get("dictValue"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value()); wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid)); wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType); wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName); @@ -115,14 +111,14 @@ public class SysDictServiceImpl extends BaseServiceImpl Date: Tue, 24 Sep 2019 14:53:51 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/SysDeptController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 973101cb0..02e44f4d6 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 @@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,7 +60,7 @@ public class SysDeptController { /*** * 通过编码得到党委编码 * @param partyCode - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/20 19:56 */ @@ -106,9 +107,8 @@ public class SysDeptController { public Result delete(@PathVariable("id") Long id) { //效验数据 AssertUtils.isNull(id, "id"); - - sysDeptService.delete(id); - +// sysDeptService.delete(id); + sysDeptService.deleteBatchIds(Arrays.asList(new Long[]{id})); return new Result(); } @@ -135,7 +135,7 @@ public class SysDeptController { * 通过街道ID获取项目可流转部门 * * @Params: [deptId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 17:00 */ From e1509049a08f3d9715a3e52da31e559b11da6a71 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 24 Sep 2019 15:07:28 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E8=BD=AC=E9=83=A8=E9=97=A8=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 7bf07e243..426016925 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 @@ -461,6 +461,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2019/9/16 19:42 */ private Result checkItemCirculation(ItemHandleSubmitFormDTO dto) { + // 判断流转部门不能为空 + if (null == dto.getDeptResultDTOS() || dto.getDeptResultDTOS().size() <= 0) { + return new Result().error("请选择流转协助部门"); + } // 校验是否跨级流转 String typeKey = ""; for (ItemCirculationDeptResultDTO circulationDeptResultDTO: