Merge remote-tracking branch 'origin/V0.0.9' into V0.0.9

# Conflicts:
#	soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

project_data/sql/0.0.9/soc/soc.sql

@@ -18,6 +18,16 @@ BEGIN
             add in_book int default 0 null comment '是否关联登记簿,0否1是' after deleted;
     END IF;
 
+    -- sys_user 表增加 signature_seal 签名印章字段
+    IF NOT EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'sys_user'
+                AND column_name = 'signature_seal') THEN
+    ALTER TABLE `sys_user`
+        ADD COLUMN `signature_seal` varchar(255) DEFAULT NULL COMMENT '签名印章' AFTER `is_manage`;
+    END IF;
+
 
 END ??
 DELIMITER ;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -234,6 +234,12 @@ public class SysUser{
     @JsonSerialize(using = ToStringSerializer.class)
     private Long originalOrgId;
 
+    /**
+     * 签名印章
+     */
+    @ApiModelProperty(value = "签名印章")
+    private String signatureSeal;
+
     @TableField(exist = false)
     private Long isManager;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -661,6 +661,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         task.setSubmitTime(data.getPlanStartTime());
         task.setSubmitorId(SecurityUtils.getUserId());
         task.setSubmitBy(SecurityUtils.getLoginUser().getName());
+        task.setSignImg(data.getSignImg());
 
         return baseMapper.insert(task) > 0;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -113,6 +113,7 @@ public class TaskRegisterVo<T> {
         vo.setGrantUserId(task.getGrantUserId());
         vo.setExceptionCount(task.getExceptionCount().intValue());
         vo.setSubmitBy(task.getSubmitBy());
+        vo.setSignImg(task.getSignImg());
 
         vo.setInRegisterTime(inRegisterTime);
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -760,6 +760,21 @@ public class SysUserController extends BaseController {
         return userService.findReminderUser(userQueryDto);
     }
 
+    /**
+     * 修改用户签名鹰印章
+     */
+    //@Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateSignatureSeal")
+    public AjaxResult updateSignatureSeal(@RequestBody SysUser user) {
+        if (null == user || StringUtils.isEmpty(user.getSignatureSeal())){
+            return error("签名印章不能为空!");
+        }
+        SysUser updateUser = new SysUser();
+        updateUser.setId(SecurityUtils.getUserId());
+        updateUser.setSignatureSeal(user.getSignatureSeal());
+        return toAjax(userService.updateById(updateUser));
+    }
+
     @RequiresPermissions("system:user:import")
     @PostMapping("/importRole")
     @Transactional(rollbackFor = {RuntimeException.class, Exception.class})