| @@ -151,7 +151,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -161,10 +161,10 @@ public class PersonMouldController extends BaseController { | |||||
| throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择模板"); | 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(),"请选择用户"); | throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择用户"); | ||||
| } | } | ||||
| personMouldService.associatedUserMoulds(spm.getMouldIds(), spm.getCUserId()); | |||||
| personMouldService.associatedUserMoulds(spm.getMouldIds(), spm.getUserId()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -21,8 +21,8 @@ public class UserPersonMould extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="PersonMould编号",name="personMouldId") | @io.swagger.annotations.ApiModelProperty(value="PersonMould编号",name="personMouldId") | ||||
| private Long 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") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| @@ -57,7 +57,7 @@ public class PersonMouldServiceImpl implements PersonMouldService { | |||||
| public PageInfo<PersonMould> cListAsPage(PersonMould record, Integer pageIndex, Integer pageSize) { | public PageInfo<PersonMould> cListAsPage(PersonMould record, Integer pageIndex, Integer pageSize) { | ||||
| if (null != record.getCuserId()) { | if (null != record.getCuserId()) { | ||||
| UserPersonMould upm = new UserPersonMould(); | UserPersonMould upm = new UserPersonMould(); | ||||
| upm.setCUserId(record.getCuserId()); | |||||
| upm.setUserId(record.getCuserId()); | |||||
| List<Long> mouldIds = userPersonMouldMapper.findMouldIdList(upm); | List<Long> mouldIds = userPersonMouldMapper.findMouldIdList(upm); | ||||
| if (null == mouldIds || mouldIds.size() <= 0 ) { | if (null == mouldIds || mouldIds.size() <= 0 ) { | ||||
| List<Long> pmids = new ArrayList<Long>(); | List<Long> pmids = new ArrayList<Long>(); | ||||
| @@ -168,7 +168,7 @@ public class PersonMouldServiceImpl implements PersonMouldService { | |||||
| for (int i = 0 ; i < mouldIds.size() ; i ++) { | for (int i = 0 ; i < mouldIds.size() ; i ++) { | ||||
| UserPersonMould upm = new UserPersonMould(); | UserPersonMould upm = new UserPersonMould(); | ||||
| upm.setId(IdWorker.get().nextId()); | upm.setId(IdWorker.get().nextId()); | ||||
| upm.setCUserId(cUserId); | |||||
| upm.setUserId(cUserId); | |||||
| upm.setPersonMouldId(mouldIds.get(i)); | upm.setPersonMouldId(mouldIds.get(i)); | ||||
| upm.setCreateDate(new Date()); | upm.setCreateDate(new Date()); | ||||
| upm.setUpdateDate(new Date()); | upm.setUpdateDate(new Date()); | ||||
| @@ -4,7 +4,7 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.sm.UserPersonMould"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.sm.UserPersonMould"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="person_mould_id" jdbcType="BIGINT" property="personMouldId"/> | <result column="person_mould_id" jdbcType="BIGINT" property="personMouldId"/> | ||||
| <result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> | |||||
| <result column="c_user_id" jdbcType="BIGINT" property="userId" /> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -34,7 +34,7 @@ | |||||
| select person_mould_id | select person_mould_id | ||||
| from user_person_mould | from user_person_mould | ||||
| <if test=" null != cUserId "> | <if test=" null != cUserId "> | ||||
| where c_user_id = #{cUserId} | |||||
| where c_user_id = #{userId} | |||||
| </if> | </if> | ||||
| <if test=" null != cuserIds "> | <if test=" null != cuserIds "> | ||||
| where c_user_id in | where c_user_id in | ||||
| @@ -61,7 +61,7 @@ | |||||
| ( | ( | ||||
| #{item.id}, | #{item.id}, | ||||
| #{item.personMouldId}, | #{item.personMouldId}, | ||||
| #{item.cUserId}, | |||||
| #{item.userId}, | |||||
| #{item.createDate}, | #{item.createDate}, | ||||
| #{item.updateDate} | #{item.updateDate} | ||||
| ) | ) | ||||