wangliang 1 éve
szülő
commit
d8e6ce686b

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/entity/TBProduct.java

@@ -28,7 +28,7 @@ public class TBProduct implements Serializable {
     @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(value = "编码,CLOUD_MARK:云阅卷")
+    @ApiModelProperty(value = "编码,OFFICE:教务处,CLOUD_MARK:云阅卷")
     private ProductTypeEnum code;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")

+ 3 - 1
sop-business/src/main/java/com/qmth/sop/business/service/SysUserService.java

@@ -93,9 +93,10 @@ public interface SysUserService extends IService<SysUser> {
      * 新增/修改用户
      *
      * @param sysUser
+     * @param requestUser
      * @return
      */
-    Boolean saveUser(SysUser sysUser,SysUser requestUser);
+    Boolean saveUser(SysUser sysUser, SysUser requestUser);
 
     /**
      * 启用/禁用用户
@@ -134,6 +135,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 根据角色类型查询用户
+     *
      * @param roleType 角色类型
      * @return 用户集合
      */

+ 2 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserServiceImpl.java

@@ -287,6 +287,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 新增/修改用户
      *
      * @param sysUser
+     * @param requestUser
      * @return
      */
     @Override
@@ -294,7 +295,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Boolean saveUser(SysUser sysUser, SysUser requestUser) {
         SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
         try {
-            if (Objects.isNull(requestUser)){
+            if (Objects.isNull(requestUser)) {
                 requestUser = (SysUser) ServletUtil.getRequestUser();
             }
             if (Objects.isNull(sysUser.getId())) {//新增用户

+ 5 - 1
sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -504,4 +504,8 @@ ALTER TABLE t_b_ding_apply CHANGE COLUMN flow_id ding_exception_no VARCHAR(100)
 ALTER TABLE t_b_ding_apply CHANGE COLUMN attachment_id attachment_ids VARCHAR(500)
     COMMENT '附件id数组' NULL;
 
-ALTER TABLE t_b_ding_apply ADD CONSTRAINT t_b_ding_apply_UN_ding_exception_no UNIQUE KEY (ding_exception_no);
+ALTER TABLE t_b_ding_apply ADD CONSTRAINT t_b_ding_apply_UN_ding_exception_no UNIQUE KEY (ding_exception_no);
+
+--2023.8.16update
+ALTER TABLE t_b_product CHANGE COLUMN code code VARCHAR(100)
+    COMMENT '编码,OFFICE:教务处,CLOUD_MARK:云阅卷' NOT NULL;