diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index bc0202cf..4eedb177 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -309,7 +309,7 @@ public class SysUserController { param.setSyUserId(""); } if(param.getSyAccount()==null){ - param.setSyAccount(""); + param.setSyAccount(userBo.getCode()); } param.setId("SU"+IdUtil.getSnowFlakeId()); boolean result = sysUserService.save(param); @@ -334,12 +334,12 @@ public class SysUserController { if(param.getLoginEnable()!=null){ param.setServingState(param.getLoginEnable()==1?1:0); } - if(param.getSyUserId()==null){ - param.setSyUserId(""); - } - if(param.getSyAccount()==null){ - param.setSyAccount(""); - } +// if(param.getSyUserId()==null){ + param.setSyUserId(null); +// } +// if(param.getSyAccount()==null){ + param.setSyAccount(null); +// } param.setSuperFlag(null); param.setPassword(null); param.setUpdateTime(LocalDateTime.now()); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 62b5c495..268ac757 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -88,7 +88,9 @@ public class TbsCostApplyVo implements Serializable { /** * 0=>未逾期、1=>已逾期、2=>即将逾期 */ - Integer overdueState; + private Integer overdueState; + + private String templateTitle; } diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index ec860b3f..8bcabecc 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -58,7 +58,8 @@ tbs_cost_apply.`create_by`, tbs_cost_apply.`update_by`, tbs_cost_apply.`del_flag`, - tbs_cost_apply.`template_id` + tbs_cost_apply.`template_id`, + tbs_cost_apply.`template_title` @@ -151,6 +152,7 @@ and `tbs_cost_apply`.`create_by` = #{query.createBy} and `tbs_cost_apply`.`update_by` = #{query.updateBy} and `tbs_cost_apply`.`del_flag` = #{query.delFlag} + and `tbs_cost_apply`.`template_title` like concat('%', #{query.templateTitle},'%')