diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java index b8b0d272a..18bd8f903 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java @@ -300,7 +300,7 @@ public class UserController { * 亮旗党员-分页列表 * * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author LZN * @date 2022/4/29 10:53 */ @@ -319,7 +319,7 @@ public class UserController { * @date 2022/4/29 10:57 */ @PostMapping("/partymembers/standardbearer/examine") - public Result standaedBearerExamine(@RequestBody StandardBearerExamineFormDTO form){ + public Result standaedBearerExamine(@RequestBody StandardBearerExamineFormDTO form) { return userService.standaedBearerExamine(form); } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java index bfbb94c67..4b696de35 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java @@ -132,8 +132,6 @@ public class UserServiceImpl extends BaseServiceImpl implem @Autowired private PartyStandardBearerApplyService partyStandardBearerApplyService; - @Autowired - private PartyTagRelationService partyTagRelationService; @Override @DataSource(value = DataSourceNames.FIRST) @@ -2012,12 +2010,12 @@ public class UserServiceImpl extends BaseServiceImpl implem entity.setId(form.getId()); entity.setRemark(form.getRemark()); entity.setExamineFlag(form.getExamineStatus()); - if(partyStandardBearerApplyService.updateById(entity)){ + if (partyStandardBearerApplyService.updateById(entity)) { String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value()); - PartyTagRelationEntity TagRelEntity = new PartyTagRelationEntity(); - TagRelEntity.setPartyId(form.getId()); + UserTagRelationEntity TagRelEntity = new UserTagRelationEntity(); + TagRelEntity.setUserId(form.getId()); TagRelEntity.setTagId(TagId); - partyTagRelationService.insert(TagRelEntity); + userTagRelationService.insert(TagRelEntity); return new Result(); } return new Result().error("党员亮旗审核处理失败"); 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 1623724b2..f68d23e4e 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 @@ -1831,29 +1831,33 @@