From 0c06fa4d45b9b7f3de4dc65bb6fbf2ef0441c186 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Mon, 27 Jul 2020 17:59:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=A0=87=E9=A2=98,=E5=A2=9E=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95check=E3=80=91=20=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-07-27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/excel/EvaluateOfficerExcel.java | 14 +++++++++----- .../phrases/service/impl/ActPhraseServiceImpl.java | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java index a2359e974..e7429598c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java @@ -44,14 +44,18 @@ public class EvaluateOfficerExcel { @Excel(name = "单位职务") private String position; + @Excel(name = "创建时间") + private String createTime; + @Excel(name = "排序") private Integer sort; - @Excel(name = "点赞次数") - private Integer likesCount; - @Excel(name = "被踩次数") - private Integer opposeCount; +// @Excel(name = "点赞次数") +// private Integer likesCount; +// +// @Excel(name = "被踩次数") +// private Integer opposeCount; /* @Excel(name = "乐观锁") private Integer revision; @@ -72,4 +76,4 @@ public class EvaluateOfficerExcel { private Date updatedTime;*/ -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java index 25628a3c3..336b8f732 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java @@ -128,6 +128,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的编码已存在"); + } + } ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class); updateById(entity); From ffb84c95c47bcfa72a9a99d404250939548656db Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 28 Jul 2020 11:33:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0BUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91-=E3=80=90=E6=A8=A1=E7=B3=8A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=9B=E6=97=B6=E9=97=B4=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/SysDictServiceImpl.java | 2 +- .../src/main/resources/mapper/PartyAuthenticationFailedDao.xml | 2 +- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 2 +- 3 files changed, 3 insertions(+), 3 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 5b5a69ffa..4e82bbba2 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 @@ -77,7 +77,7 @@ public class SysDictServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid)); - wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType); + wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType); wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName); wrapper.like(StringUtils.isNotBlank(dictValue), "dict_value", dictValue); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml index 1d3aa5f89..2ebd124c2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml @@ -46,7 +46,7 @@ WHERE epaf.del_flag = '0' - and epaf.created_time between #{startTime} and #{endTime} + and DATE_FORMAT( epaf.created_time, '%Y-%m-%d' ) between #{startTime} and #{endTime} and epaf.IDENTITY_NO = #{identityNo} and epaf.real_name = #{realName} 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 ac0ecd951..c98757ac0 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 @@ -1262,7 +1262,7 @@ FROM epdc_user uu where uu.DEL_FLAG = '0' - and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime} + and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime} and uu.real_name like '%${realName}%' and uu.NICKNAME like '%${nickname}%' and uu.mobile like '%${mobile}%' From 2bc619ed66035499110a6b687551a3f623bd863f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 28 Jul 2020 15:05:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0BUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91-=E3=80=90=E5=85=9A=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3bug=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/07/28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/PartyMembersDTO.java | 7 +- .../controller/PartyMembersController.java | 2 +- .../elink/esua/epdc/dao/PartyMembersDao.java | 4 +- .../esua/epdc/excel/PartyMembersExcel.java | 22 ++++--- .../epdc/service/PartyMembersService.java | 3 +- .../service/impl/PartyMembersServiceImpl.java | 44 +++++++++++++ .../mapper/PartyAuthenticationFailedDao.xml | 6 +- .../main/resources/mapper/PartyMembersDao.xml | 64 +++++++++++++++++-- 8 files changed, 128 insertions(+), 24 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java index a89356120..aedb8e61d 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java @@ -17,11 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import java.util.List; - -import lombok.Data; /** @@ -56,6 +55,8 @@ public class PartyMembersDTO implements Serializable { private String registFlag; + private String registName; + private Date registTime; private String streetName; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index 041c651c6..99bcee5da 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -160,7 +160,7 @@ public class PartyMembersController { @GetMapping("hasAuthenticationexport") // @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) public void hasAuthenticationexport(@RequestParam Map params, HttpServletResponse response) throws Exception { - ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExport(params), PartyMembersExcel.class); + ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExportNew(params), PartyMembersExcel.class); } /*** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java index 9a482741e..7a78463b0 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java @@ -22,9 +22,7 @@ import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.PathVariable; -import java.io.Serializable; import java.util.List; import java.util.Map; @@ -85,6 +83,8 @@ public interface PartyMembersDao extends BaseDao { List optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List userIdList); + List optimizeHasAuthenticationPartyPageInfoNew(@Param("userIdList") List userIdList); + /*** * 删除时校验党员是否被认证 * @param IdentityNo diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java index 5cf674f62..a4dadce0c 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java @@ -34,20 +34,14 @@ public class PartyMembersExcel { @Excel(name = "姓名") private String realName; - @Excel(name = "联系电话") + @Excel(name = "手机号") private String mobile; @Excel(name = "身份证号") private String identityNo; - @Excel(name = "职务") - private String post; - - @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"}) - private String cadreFlag; - - @Excel(name = "是否注册", replace = {"是_1", "否_0"}) - private String registFlag; + @Excel(name = "注册状态") + private String registName; @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss") private Date registTime; @@ -57,4 +51,14 @@ public class PartyMembersExcel { @Excel(name = "街道-社区-网格") private String allDeptNames; + + @Excel(name = "职务") + private String post; + + @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"}) + private String cadreFlag; + + @Excel(name = "是否注册", replace = {"是_1", "否_0"}) + private String registFlag; + } \ 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/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java index 564c9f7e3..ce27fe0d1 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java @@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; import com.elink.esua.epdc.entity.UserEntity; -import com.elink.esua.epdc.excel.PartyMembersExcel; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import org.springframework.web.multipart.MultipartFile; @@ -123,6 +122,8 @@ public interface PartyMembersService extends BaseService { List optimizeHasAuthenticationPartyExport(Map params); + List optimizeHasAuthenticationPartyExportNew(Map params); + /*** * 通过身份证校验此党员是否被认证 * @param IdentityNo diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 518271906..896cd7703 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -181,6 +181,15 @@ public class PartyMembersServiceImpl extends BaseServiceImpl partyMembersEntityList = baseDao.selectList(new QueryWrapper()); + // 去空格 + List partyList = new ArrayList<>(); + // 校验数据 + String message = this.checkExcelNew(dto, partyMembersEntityList); + if (StringUtils.isNotBlank(message)) { + throw new RenException(message); + } + PartyMembersEntity entity = new PartyMembersEntity(); entity.setCadreFlag(dto.getCadreFlag()); entity.setRealName(dto.getRealName()); @@ -216,6 +225,27 @@ public class PartyMembersServiceImpl extends BaseServiceImpl partyMembersEntityList) { + // 不匹配信息 + String result = null; + EpdcPartyErroyResultDTO errorLineinfoDto; + if (StringUtils.isBlank(dto.getRealName())) { + result = "姓名为空"; + } + if (StringUtils.isBlank(dto.getIdentityNo())) { + result = "身份证号为空"; + } + for (PartyMembersEntity item : partyMembersEntityList) { + if (StringUtils.isNotBlank(item.getMobile()) && item.getMobile().equals(dto.getMobile())) { + result = "手机号已存在"; + } + if (item.getIdentityNo().equals(dto.getIdentityNo())) { + result = "身份证号已存在"; + } + } + return result; + } + @Override @Transactional(rollbackFor = Exception.class) public void update(PartyMembersDTO dto) { @@ -533,6 +563,20 @@ public class PartyMembersServiceImpl extends BaseServiceImpl optimizeHasAuthenticationPartyExportNew(Map params) { + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); +// IPage page = getPage(params); + List userIds = baseDao.optimizeHasAuthenticationPartyPage(params); + if (userIds.size() > 0) { + List partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfoNew(userIds); + return partyMembersDTOList; + } else { + return new ArrayList(); + } + + } + @Override public Integer checkCertificationByIdentityNo(String IdentityNo) { return baseDao.selectCountByIdentity(IdentityNo); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml index 2ebd124c2..768c64188 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml @@ -48,9 +48,9 @@ and DATE_FORMAT( epaf.created_time, '%Y-%m-%d' ) between #{startTime} and #{endTime} - and epaf.IDENTITY_NO = #{identityNo} - and epaf.real_name = #{realName} - and epaf.mobile = #{mobile} + and epaf.IDENTITY_NO like '%${identityNo}%' + and epaf.real_name like '%${realName}%' + and epaf.mobile like '%${mobile}%' ORDER BY epaf.CREATED_TIME desc diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index f913d6f45..ed648a196 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -100,13 +100,13 @@ AND ut.DEL_FLAG = '0' WHERE eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0' - and pm.REAL_NAME = #{realName} - and pm.MOBILE = #{mobile} - and pm.IDENTITY_NO = #{identityNo} + and pm.REAL_NAME like '%${realName}%' + and pm.MOBILE like '%${mobile}%' + and pm.IDENTITY_NO like '%${identityNo}%' and pm.REGIST_FLAG = #{registFlag} and pm.POST_ID = #{postId} - and pm.REGIST_TIME >= #{startTime} - #{endTime} + and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime} + #{endTime} AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS)) @@ -326,6 +326,60 @@ ORDER BY allu.registTime DESC + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java index cc73799f0..ba026c5a1 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java @@ -20,6 +20,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 职责分类管理 * @@ -28,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface GridOperatorDutyCategoryDao extends BaseDao { - -} \ No newline at end of file + /** + * @Description: 判断权限编码是否重复 + * @Param: [dutyCategoryName] + * @return: java.util.List + * @Author: wk + * @Date: 2020/7/28 + */ + List seleCategoryName(String dutyCategoryName); + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java index 27e339af9..09667c04b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java @@ -89,6 +89,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl list = baseDao.seleCategoryName(dutyCategoryName); + if (null!=list && list.size()>0){ + throw new RenException("网格专员职责类别名称重复"); + } + + } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml index 5f4e3a5f2..99f344a58 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml @@ -13,6 +13,15 @@ + - \ No newline at end of file + diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java index ff7518ae6..be0614e3f 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java @@ -47,7 +47,7 @@ import java.util.Map; @RestController @RequestMapping("group") public class GroupController { - + @Autowired private GroupService groupService; @@ -145,7 +145,11 @@ public class GroupController { */ @GetMapping("groupList") public Result> groupList() { - List data = groupService.listOfGroupByGridId(SecurityUser.getDeptId()); + String deptId = SecurityUser.getUser().getDeptId().toString(); + if(null ==deptId){ + deptId = null; + } + List data = groupService.listOfGroupByGridId(deptId); return new Result>().ok(data); } @@ -181,4 +185,4 @@ public class GroupController { return new Result>().ok(page); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java index 7b1db6363..6a7e31a15 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; import com.elink.esua.epdc.modules.group.entity.GroupEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -114,7 +115,7 @@ public interface GroupDao extends BaseDao { * @author liuchuang * @since 2019/11/12 9:35 */ - List selectListOfGroupByGridId(Long deptId); + List selectListOfGroupByGridId(@Param("deptId") String deptId); /** * @@ -157,14 +158,14 @@ public interface GroupDao extends BaseDao { * @Date 2019/12/19 13:08 **/ List listPartyMemberGridId(); - - /** - * @Description: 根据社群id，查询群主手机号 - * @Param: [groupId] - * @return: java.lang.String - * @Author: zy - * @Date: 2020-01-08 - */ + + /** + * @Description: 根据社群id，查询群主手机号 + * @Param: [groupId] + * @return: java.lang.String + * @Author: zy + * @Date: 2020-01-08 + */ String queryGroupUserMOBILE(String groupId); /** diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java index e15319a6b..b09e84fa0 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java @@ -228,7 +228,7 @@ public interface GroupService extends BaseService { * @author liuchuang * @since 2019/11/12 9:33 */ - List listOfGroupByGridId(Long deptId); + List listOfGroupByGridId(String deptId); /** * diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index bc0f431b3..9ba021a5e 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java @@ -369,7 +369,7 @@ public class GroupServiceImpl extends BaseServiceImpl imp } @Override - public List listOfGroupByGridId(Long deptId) { + public List listOfGroupByGridId(String deptId) { return baseDao.selectListOfGroupByGridId(deptId); } 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 5cedcb05b..1892f866f 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 @@ -271,7 +271,7 @@ ORDER BY AND gp.ID = #{id} - SELECT ID AS groupId, GROUP_NAME AS groupName @@ -280,7 +280,9 @@ ORDER BY WHERE DEL_FLAG = '0' AND STATE IN ( 10, 15, 20 ) - AND GRID_ID = #{deptId} + + AND GRID_ID = #{deptId} +