diff --git a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 89b38cb..a0091de 100644 --- a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -151,7 +151,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java index abe2721..39fa21d 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java @@ -161,10 +161,10 @@ public class PersonMouldController extends BaseController { throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择模板"); } - if (null == spm.getCUserId() ) { + if (null == spm.getUserId() ) { throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择用户"); } - personMouldService.associatedUserMoulds(spm.getMouldIds(), spm.getCUserId()); + personMouldService.associatedUserMoulds(spm.getMouldIds(), spm.getUserId()); return new ResultData(); } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java index ee8b2dd..acc8fd1 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java @@ -21,8 +21,8 @@ public class UserPersonMould extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="PersonMould编号",name="personMouldId") private Long personMouldId; - @io.swagger.annotations.ApiModelProperty(value="WxCuserBasicInfo编码",name="cUserId") - private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value="WxCuserBasicInfo编码",name="userId") + private Long userId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java index f9c14f0..5dcf465 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java @@ -57,7 +57,7 @@ public class PersonMouldServiceImpl implements PersonMouldService { public PageInfo cListAsPage(PersonMould record, Integer pageIndex, Integer pageSize) { if (null != record.getCuserId()) { UserPersonMould upm = new UserPersonMould(); - upm.setCUserId(record.getCuserId()); + upm.setUserId(record.getCuserId()); List mouldIds = userPersonMouldMapper.findMouldIdList(upm); if (null == mouldIds || mouldIds.size() <= 0 ) { List pmids = new ArrayList(); @@ -168,7 +168,7 @@ public class PersonMouldServiceImpl implements PersonMouldService { for (int i = 0 ; i < mouldIds.size() ; i ++) { UserPersonMould upm = new UserPersonMould(); upm.setId(IdWorker.get().nextId()); - upm.setCUserId(cUserId); + upm.setUserId(cUserId); upm.setPersonMouldId(mouldIds.get(i)); upm.setCreateDate(new Date()); upm.setUpdateDate(new Date()); diff --git a/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml b/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml index d9e3405..da68d54 100644 --- a/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ select person_mould_id from user_person_mould - where c_user_id = #{cUserId} + where c_user_id = #{userId} where c_user_id in @@ -61,7 +61,7 @@ ( #{item.id}, #{item.personMouldId}, - #{item.cUserId}, + #{item.userId}, #{item.createDate}, #{item.updateDate} )