修改部门树接口参数
parent
4cf47379aa
commit
e6257d8f66
|
|
@ -203,7 +203,9 @@ public class UserUpdateExe {
|
||||||
|
|
||||||
// 根据手机号查询用户信息
|
// 根据手机号查询用户信息
|
||||||
List<UserDO> listByPhone = userRepository.getListByPhone(cmd.getPhone(),null);
|
List<UserDO> listByPhone = userRepository.getListByPhone(cmd.getPhone(),null);
|
||||||
|
if(CollUtil.isEmpty(listByPhone)){
|
||||||
|
throw new BizException("手机号不存在");
|
||||||
|
}
|
||||||
UserE userE = new UserE();
|
UserE userE = new UserE();
|
||||||
userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword());
|
userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword());
|
||||||
//TODO 需要修改
|
//TODO 需要修改
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ public class DepartmentQueryExe {
|
||||||
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
|
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
|
||||||
List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType"));
|
List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType"));
|
||||||
if (CollUtil.isNotEmpty(enterpriseType)) {
|
if (CollUtil.isNotEmpty(enterpriseType)) {
|
||||||
parmas.put("corpinfoTypeList",enterpriseType);
|
parmas.put("inType",enterpriseType);
|
||||||
}
|
}
|
||||||
List<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpType(parmas);
|
List<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpType(parmas);
|
||||||
if (CollUtil.isEmpty(pageResponse)) {
|
if (CollUtil.isEmpty(pageResponse)) {
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class DepartmentTreeQry {
|
||||||
private Long eqCorpinfoId;
|
private Long eqCorpinfoId;
|
||||||
@ApiModelProperty(value = "父id", name = "eqParentId")
|
@ApiModelProperty(value = "父id", name = "eqParentId")
|
||||||
private Long eqParentId;
|
private Long eqParentId;
|
||||||
@ApiModelProperty(value = "企业类型(0-普通企业,1-集团单位,2-股份单位,3-相关方企业,4-货主单位,5-驻港单位)", name = "corpinfoTypeList")
|
@ApiModelProperty(value = "企业类型(0-普通企业,1-集团单位,2-股份单位,3-相关方企业,4-货主单位,5-驻港单位)", name = "inType")
|
||||||
private List<Integer> corpinfoTypeList;
|
private List<Integer> inType;
|
||||||
|
|
||||||
@ApiModelProperty(value = "企业类型1:监管 2:企业 3:相关方", name = "enterpriseType")
|
@ApiModelProperty(value = "企业类型1:监管 2:企业 3:相关方", name = "enterpriseType")
|
||||||
private Integer enterpriseType;
|
private Integer enterpriseType;
|
||||||
|
|
|
||||||
|
|
@ -514,8 +514,6 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
|
||||||
throw new BizException("请输入原密码");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//修改多个密码
|
//修改多个密码
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
left join corp_info c on d.corpinfo_id = c.id
|
left join corp_info c on d.corpinfo_id = c.id
|
||||||
where d.delete_enum = 'FALSE'
|
where d.delete_enum = 'FALSE'
|
||||||
and c.delete_enum = 'FALSE'
|
and c.delete_enum = 'FALSE'
|
||||||
<if test="corpinfoTypeList != null and corpinfoTypeList.size() > 0">
|
<if test="inType != null and inType.size() > 0">
|
||||||
and c.type in
|
and c.type in
|
||||||
<foreach collection="corpinfoTypeList" item="item" open="(" close=")" separator=",">
|
<foreach collection="inType" item="item" open="(" close=")" separator=",">
|
||||||
#{item}
|
#{item}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue