diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java index cd6f3dec..a35f238b 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java @@ -112,6 +112,7 @@ public class SysPostController { return R.error2(); } sysPostService.modify(param); + sysPostService.flushPathIds(); return R.ok(); } @@ -135,6 +136,7 @@ public class SysPostController { public R save(@RequestBody @Valid SysPost param){ param.setId(null); sysPostService.modify(param); + sysPostService.flushPathIds(); return R.ok(param); } diff --git a/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java b/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java index 4ab6a017..a927f1fd 100644 --- a/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java +++ b/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java @@ -11,6 +11,19 @@ import org.apache.ibatis.annotations.Update; */ public interface SysPostMapper extends BaseMapper { + /** + * 修改post表 更关联表post_user + * @return + */ + @Update("update sys_post_user " + + " left join sys_post " + + " on sys_post_user.post_id = sys_post.id" + + " set " + + " sys_post_user.post_code = sys_post.post_code, " + + " sys_post_user.post_name = sys_post.post_name " + + " where sys_post_user.del_flag = 0 and sys_post.del_flag = 0 ") + int updatePostUserInfo(); + /** * 根据岗位更新员工的路径绑定ID * @return diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java index 68e1841a..237bc266 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java @@ -100,6 +100,7 @@ public class SysPostServiceImpl extends ServiceImpl impl toFlushPathIds(pid, null,null); //更新绑定的用户路径 baseMapper.updatePostUserIdPaths(); + baseMapper.updatePostUserInfo(); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java index fc35e107..76d76b11 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; import lombok.Data; import org.apache.ibatis.type.JdbcType; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -47,6 +48,7 @@ public class TbsAffairCommitBo { /** * 评论 */ + @Length(max = 800,message = "备注长度限制800字") @NotNull private String comment; diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 2c81bd8f..3b6a3e64 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -320,7 +320,9 @@ public class VtbVerificationController { yard.setYardItemList(yardItemList); SysUser sysUser = sysUserService.getById(yard.getCreateBy()); - yard.setUserInfo(sysUser.toSysUserVo()); + if(sysUser!=null){ + yard.setUserInfo(sysUser.toSysUserVo()); + } } Map result = new HashMap<>(2); result.put("verification",verification);