添加安全检查不同周期定时任务

project_data/sql/0.0.2/quartz/quartz.sql

@@ -14,3 +14,12 @@ delete from `sys_job` where invoke_target like 'CoreDrillTask.buildDrillTask%';
 INSERT INTO sys_job ( job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time) VALUES ('预案演练任务生成定时任务', 'DEFAULT', 'CoreDrillTask.buildDrillTask()', '0 0 1 * * ?', '1', '1', '0', '超级管理员', '2023-10-10 10:51:13', '', null);
 INSERT INTO sys_job ( job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time) VALUES ('预案演练任务生成定时任务(补偿接口)', 'DEFAULT', 'CoreDrillTask.buildDrillTask(\'cycle\',\'date\')', '0 0 1 * * ?', '1', '1', '1', '超级管理员', '2023-10-10 10:52:03', '', null);
 
+delete from `sys_job` where invoke_target like 'CoreSafetyCheckTask.buildQuarterTask%';
+delete from `sys_job` where invoke_target like 'CoreSafetyCheckTask.buildMonthTask%';
+delete from `sys_job` where invoke_target like 'CoreSafetyCheckTask.buildHalfYearTask%';
+delete from `sys_job` where invoke_target like 'CoreSafetyCheckTask.buildYearTask%';
+
+INSERT INTO `sys_job`( `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '生成每季度安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildQuarterTask', '1 1 1 1 1/3 ?', '1', '1', '0', '省联社账号', '2023-10-10 10:35:42', '省联社账号', '2023-10-10 10:40:02');
+INSERT INTO `sys_job`( `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '生成每月安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildMonthTask', '1 1 1 1 * ?', '1', '1', '0', '省联社账号', '2023-10-10 10:37:20', '', NULL);
+INSERT INTO `sys_job`( `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '生成每半年安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildHalfYearTask', '1 1 1 1 1/6 ?', '1', '1', '0', '省联社账号', '2023-10-10 10:38:31', '', NULL);
+INSERT INTO `sys_job`( `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '生成每年安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildYearTask', '1 1 1 1 1 ? *', '1', '1', '0', '省联社账号', '2023-10-10 10:39:38', '', NULL);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteSafetyCheckService.java

@@ -35,14 +35,34 @@ public interface RemoteSafetyCheckService {
      */
     @GetMapping(value = "checkplan/WeekTask")
     R<Boolean> weekTask();
-
     /**
-     * 生成每月、季、半年、年履职任务
+     * 生成每月检查任务
      *
      * @return
      */
     @GetMapping(value = "checkplan/MonthTask")
     R<Boolean> monthTask();
+    /**
+     * 生成每季检查任务
+     *
+     * @return
+     */
+    @GetMapping(value = "checkplan/QuarterTask")
+    R<Boolean> quarterTask();
+    /**
+     * 生成每半年检查任务
+     *
+     * @return
+     */
+    @GetMapping(value = "checkplan/HalfYearTask")
+    R<Boolean> halfYearTask();
+    /**
+     * 生成每年检查任务
+     *
+     * @return
+     */
+    @GetMapping(value = "checkplan/YearTask")
+    R<Boolean> yearTask();
 
 
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteSafetyCheckTaskFallbackFactory.java

@@ -23,6 +23,21 @@ public class RemoteSafetyCheckTaskFallbackFactory implements FallbackFactory<Rem
             public R<Boolean> monthTask() {
                 return null;
             }
+
+            @Override
+            public R<Boolean> quarterTask() {
+                return null;
+            }
+
+            @Override
+            public R<Boolean> halfYearTask() {
+                return null;
+            }
+
+            @Override
+            public R<Boolean> yearTask() {
+                return null;
+            }
         };
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -1,10 +1,7 @@
 package com.xunmei.core.safetyCheck.controller;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.io.IOException;
-import java.util.Map;
-import java.util.TimeZone;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -99,17 +96,27 @@ public class CoreSafecheckPlanController extends BaseController {
     public AjaxResult edit(@RequestBody CoreSafecheckPlan coreSafecheckPlan) {
         return toAjax(coreSafecheckPlanService.updateCoreSafecheckPlan(coreSafecheckPlan));
     }
+
     @PostMapping("/distribute")
     @RequiresPermissions("core:checkplan:distribute")
     public AjaxResult distribute(@RequestBody DistributeDto dto) {
         try {
             coreSafecheckPlanService.distributeToOrg(dto);
+            //下发完成生成任务
+            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(dto.getId());
+            int cycle = Math.toIntExact(plan.getPlanCycle());
+            DateTime datetime = new DateTime();
+            datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+            DateHelper dateHelper = new DateHelper(datetime);
+            Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, cycle);
+            jobBusiness.createTask(datetime, cycle, map.get("start"), map.get("end"));
             return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("数据处理错误：" + e.getMessage());
         }
     }
+
     /**
      * 删除常规安全检查计划
      */
@@ -123,7 +130,6 @@ public class CoreSafecheckPlanController extends BaseController {
 
     @ApiOperation(value = "生成每日常规安全检查任务")
     @GetMapping(value = "/DayTask")
-//    @RequiresPermissions("core:plan:findById")
     public AjaxResult safeCheckDayTask() {
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -141,7 +147,6 @@ public class CoreSafecheckPlanController extends BaseController {
 
     @ApiOperation(value = "生成每周常规安全检查任务")
     @GetMapping(value = "/WeekTask")
-//    @RequiresPermissions("core:plan:findById")
     public AjaxResult safeCheckWeekTask() {
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -159,7 +164,6 @@ public class CoreSafecheckPlanController extends BaseController {
 
     @ApiOperation(value = "生成每月常规安全检查任务")
     @GetMapping(value = "/MonthTask")
-//    @RequiresPermissions("core:plan:findById")
     public AjaxResult safeCheckMonthTask() {
         DateTime dateTime = new DateTime();
         dateTime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -170,25 +174,77 @@ public class CoreSafecheckPlanController extends BaseController {
             map = DateHelper.getStartAndEnd(dateHelper, 2);
             jobBusiness.createTask(dateTime, 2, map.get("start"), map.get("end"));
 //            SCHEDULEDTASKSLOG.info("每月常规安全检查任务生成结束!");
-            int month = dateHelper.getMonth();
-            if (month == 1 || month == 4 || month == 7 || month == 10) {
-                map = DateHelper.getStartAndEnd(dateHelper, 3);
-                jobBusiness.createTask(dateTime, 3, map.get("start"), map.get("end"));
-//                SCHEDULEDTASKSLOG.info("每季度常规安全检查任务生成结束!,当前月份:{}", month);
-            }
-            if (month == 1 || month == 7) {
-                map = DateHelper.getStartAndEnd(dateHelper, 4);
-                jobBusiness.createTask(dateTime, 4, map.get("start"), map.get("end"));
-//                SCHEDULEDTASKSLOG.info("每半年常规安全检查任务生成结束!,当前月份:{}", month);
-            }
-            if (month == 1) {
-                map = DateHelper.getStartAndEnd(dateHelper, 5);
-                jobBusiness.createTask(dateTime, 5, map.get("start"), map.get("end"));
-//                SCHEDULEDTASKSLOG.info("每年常规安全检查任务生成结束! ");
-            }
+//            int month = dateHelper.getMonth();
+//            if (month == 1 || month == 4 || month == 7 || month == 10) {
+//                map = DateHelper.getStartAndEnd(dateHelper, 3);
+//                jobBusiness.createTask(dateTime, 3, map.get("start"), map.get("end"));
+////                SCHEDULEDTASKSLOG.info("每季度常规安全检查任务生成结束!,当前月份:{}", month);
+//            }
+//            if (month == 1 || month == 7) {
+//                map = DateHelper.getStartAndEnd(dateHelper, 4);
+//                jobBusiness.createTask(dateTime, 4, map.get("start"), map.get("end"));
+////                SCHEDULEDTASKSLOG.info("每半年常规安全检查任务生成结束!,当前月份:{}", month);
+//            }
+//            if (month == 1) {
+//                map = DateHelper.getStartAndEnd(dateHelper, 5);
+//                jobBusiness.createTask(dateTime, 5, map.get("start"), map.get("end"));
+////                SCHEDULEDTASKSLOG.info("每年常规安全检查任务生成结束! ");
+//            }
         } catch (Exception e) {
             throw new RuntimeException("生成每月常规安全检查任务失败!");
         }
         return AjaxResult.success("开始生成每月常规安全检查任务!");
     }
+
+
+    @ApiOperation(value = "生成每季度常规安全检查任务")
+    @GetMapping(value = "/QuarterTask")
+    public AjaxResult safeCheckQuarterTask() {
+        DateTime dateTime = new DateTime();
+        dateTime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        final DateHelper dateHelper = new DateHelper(dateTime);
+        Map<String, Date> map = null;
+        try {
+            map = DateHelper.getStartAndEnd(dateHelper, 3);
+            jobBusiness.createTask(dateTime, 3, map.get("start"), map.get("end"));
+//                SCHEDULEDTASKSLOG.info("每季度常规安全检查任务生成结束!,当前月份:{}", month);
+        } catch (Exception e) {
+            throw new RuntimeException("生成每季度常规安全检查任务失败!");
+        }
+        return AjaxResult.success("开始生成每季度常规安全检查任务!");
+    }
+
+    @ApiOperation(value = "生成每半年常规安全检查任务")
+    @GetMapping(value = "/HalfYearTask")
+    public AjaxResult safeCheckHalfYearTask() {
+        DateTime dateTime = new DateTime();
+        dateTime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        final DateHelper dateHelper = new DateHelper(dateTime);
+        Map<String, Date> map = null;
+        try {
+            map = DateHelper.getStartAndEnd(dateHelper, 4);
+            jobBusiness.createTask(dateTime, 4, map.get("start"), map.get("end"));
+//                SCHEDULEDTASKSLOG.info("每半年常规安全检查任务生成结束!,当前月份:{}", month);
+        } catch (Exception e) {
+            throw new RuntimeException("生成每半年常规安全检查任务失败!");
+        }
+        return AjaxResult.success("开始生成每半年常规安全检查任务!");
+    }
+
+    @ApiOperation(value = "生成每年常规安全检查任务")
+    @GetMapping(value = "/YearTask")
+    public AjaxResult safeCheckYearTask() {
+        DateTime dateTime = new DateTime();
+        dateTime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        final DateHelper dateHelper = new DateHelper(dateTime);
+        Map<String, Date> map = null;
+        try {
+            map = DateHelper.getStartAndEnd(dateHelper, 5);
+            jobBusiness.createTask(dateTime, 5, map.get("start"), map.get("end"));
+//                SCHEDULEDTASKSLOG.info("每年常规安全检查任务生成结束!,当前月份:{}", month);
+        } catch (Exception e) {
+            throw new RuntimeException("生成每年常规安全检查任务失败!");
+        }
+        return AjaxResult.success("开始生成每年常规安全检查任务!");
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -142,13 +142,15 @@ public class SafetyCheckJobBusiness {
         List<CoreSafecheckPlanToRole> roles = planToRoleMapper.selectList(ros);
 
         List<SysOrg> execOrgs = null;
+        SysOrg ownOrg= orgService.selectOrgById(plan.getPlanOfOrgId(), SecurityConstants.INNER);
         if (ObjectUtil.isEmpty(execOrg)) {
             //如果没有选择具体执行检查的机构，则根据执行机构类型查询
-            execOrgs = orgService.selectByOrgType(execOrgType, SecurityConstants.INNER);
+            execOrgs = orgService.findByOrgTypeAndParent(execOrgType,ownOrg.getPath(), SecurityConstants.INNER);
         } else {
             //选择了具体执行检查的机构
             List<Long> orgIds = execOrg.stream().map(CoreSafecheckPlanToExecOrg::getOrgId).collect(Collectors.toList());
             execOrgs = orgService.selectOrgByIdList(orgIds, SecurityConstants.INNER);
+            execOrgs=execOrgs.stream().filter(o->o.getPath().startsWith(ownOrg.getPath())).collect(Collectors.toList());
         }
         execOrgs = execOrgs.stream().filter(o -> o.getIsLock() < 1).collect(Collectors.toList());
 
@@ -277,16 +279,27 @@ public class SafetyCheckJobBusiness {
 
         PlanTaskBuildVo vo = null;
         for (SysOrg org : execOrgList) {
-            vo = new PlanTaskBuildVo();
-            vo.setPlanId(plan.getId());
-            vo.setEndTime(plan.getEndDate());
-            vo.setStartTime(plan.getStartDate());
-            vo.setCheckOrg(check);
-            vo.setExecOrg(org);
-            vo.setPlanName(plan.getPlanName());
+//            vo = new PlanTaskBuildVo();
+//            vo.setPlanId(plan.getId());
+//            vo.setEndTime(plan.getEndDate());
+//            vo.setStartTime(plan.getStartDate());
+//            vo.setCheckOrg(check);
+//            vo.setExecOrg(org);
+//            vo.setPlanName(plan.getPlanName());
 //            vo.setRole(role);
-            vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
-            list.add(vo);
+//            vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
+//            list.add(vo);
+            for (int i = 0; i < plan.getCount(); i++) {
+                vo = new PlanTaskBuildVo();
+                vo.setPlanId(plan.getId());
+                vo.setEndTime(plan.getEndDate());
+                vo.setStartTime(plan.getStartDate());
+                vo.setCheckOrg(check);
+                vo.setExecOrg(org);
+                vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
+                vo.setPlanName(plan.getPlanName()+"第"+(i+1)+"次");
+                list.add(vo);
+            }
 //            for (CoreSafecheckPlanToRole role : roles) {
 //                vo = new PlanTaskBuildVo();
 //                vo.setPlanId(plan.getId());
@@ -299,6 +312,7 @@ public class SafetyCheckJobBusiness {
 //                vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
 //                list.add(vo);
 //            }
+
         }
 
         return list;

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

@@ -107,10 +107,13 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             CoreSafecheckPlan coreSafecheckPlan = baseMapper.selectById(dto.getId());
             coreSafecheckPlan.setDistributeStatus("1");
             coreSafecheckPlan.setPlanOfOrgId(d.getOrgId());
-            coreSafecheckPlan.setPlanStatus(Long.valueOf(d.getStatus()));
+            coreSafecheckPlan.setPlanStatus((long) (d.getStatus() == 0 ? 2 : 1));
             coreSafecheckPlan.setDistributePlanStatus(d.getStatus().toString());
             coreSafecheckPlan.setCreateTime(new Date());
             coreSafecheckPlan.setId(null);
+//            if (coreSafecheckPlan.getPlanCycle()==6){
+//                coreSafecheckPlan.setStartDate();
+//            }
 //            plan.setPlanName(plan.getPlanName()+"下发"+orgService.selectOrgById(d.getOrgId(),SecurityConstants.INNER).getName());
             coreSafecheckPlan.setPlanName(coreSafecheckPlan.getPlanName());
             coreSafecheckPlan.setParentId(dto.getId());
@@ -195,6 +198,10 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      */
     @Override
     public void insertCoreSafecheckPlan(CoreSafecheckPlan coreSafecheckPlan) {
+        if(coreSafecheckPlan.getRulePointList().size()==0){
+            throw new RuntimeException("未选择检查项!");
+        }
+
         Long pid = coreSafecheckPlan.getId();
         if (coreSafecheckPlan.getId() == null) {
             //先处理检查计划
@@ -255,10 +262,10 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             DateHelper dateHelper = new DateHelper(datetime);
 //        SCHEDULEDTASKSLOG.info("开始生成每周常规安全检查任务!");
             try {
-                Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, 1);
-                safetyCheckJobBusiness.createTask(datetime, 1, map.get("start"), map.get("end"));
+                Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, Math.toIntExact(coreSafecheckPlan.getPlanCycle()));
+                safetyCheckJobBusiness.createTask(datetime, Math.toIntExact(coreSafecheckPlan.getPlanCycle()), map.get("start"), map.get("end"));
             } catch (Exception e) {
-                throw new RuntimeException("生成每周常规安全检查任务失败!");
+                throw new RuntimeException("生成常规安全检查任务失败!");
             }
         }
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -209,15 +209,15 @@
         c.distribute,
         c.distribute_status,
         c.distribute_plan_status,
-        o1.NAME AS plan_create_org_name,
+        o1.short_name AS plan_create_org_name,
         o2.type as plan_of_org_type,
-        o2.NAME AS plan_of_org_name,
+        o2.short_name AS plan_of_org_name,
         r.role_name,
         r.id AS role_id,
         o3.id AS check_org_id,
-        o3.NAME AS check_org_name,
+        o3.short_name AS check_org_name,
         o4.id AS exec_org_id,
-        o4.NAME AS exec_org_name
+        o4.short_name AS exec_org_name
         FROM
         core_safecheck_plan c
         LEFT JOIN sys_org o1 ON c.plan_create_org_id = o1.id
@@ -257,8 +257,10 @@
             and c.plan_of_org_id in (select id from sys_org
             where path like concat((select path from sys_org where id=#{check.orgId}),'%'))
         </if>
+
         ) tem
-        GROUP BY tem.id
+        GROUP BY tem.id,tem.create_time
+        order by tem.create_time desc
     </select>
     <select id="selectItemIdsByPlanId" resultType="java.lang.String">
         select distinct point_id as item_id

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/CoreSafetyCheckTask.java

@@ -33,6 +33,21 @@ public class CoreSafetyCheckTask {
         R<Boolean> result = checkService.monthTask();
         log.info("执行执行每月检查定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
     }
+    public void buildQuarterTask() {
+        log.info("开始执行每季度检查定时任务，当前任务 时间：{}",new Date());
+        R<Boolean> result = checkService.quarterTask();
+        log.info("执行执行每季度检查定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+    }
+    public void buildHalfYearTask() {
+        log.info("开始执行每半年检查定时任务，当前任务 时间：{}",new Date());
+        R<Boolean> result = checkService.halfYearTask();
+        log.info("执行执行每半年检查定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+    }
+    public void buildYearTask() {
+        log.info("开始执行每年检查定时任务，当前任务 时间：{}",new Date());
+        R<Boolean> result = checkService.yearTask();
+        log.info("执行执行每年检查定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+    }
 
 //    public void updateTaskStatus(){
 //        log.info("开始更新检查任务状态 时间：{}",new Date());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -394,7 +394,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public int updateUserProfile(SysUser user) {
-        return userMapper.updateUser(user);
+        return userMapper.updateById(user);
     }
 
     /**

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -327,45 +327,45 @@
             <if test="deptId != null and deptId != 0">
                 dept_id = #{deptId},
             </if>
-            <if test="userName != null and userName != ''">
-                user_name = #{userName},
+            <if test="username != null and username != ''">
+                user_name = #{username},
             </if>
-            <if test="nickName != null and nickName != ''">
-                nick_name = #{nickName},
+<!--            <if test="nickname != null and nickname != ''">-->
+<!--                nick_name = #{nickname},-->
+<!--            </if>-->
+<!--            <if test="email != null ">-->
+<!--                email = #{email},-->
+<!--            </if>-->
+            <if test="phone != null ">
+                phone = #{phone},
             </if>
-            <if test="email != null ">
-                email = #{email},
-            </if>
-            <if test="phonenumber != null ">
-                phonenumber = #{phonenumber},
-            </if>
-            <if test="sex != null and sex != ''">
-                sex = #{sex},
-            </if>
-            <if test="avatar != null and avatar != ''">
-                avatar = #{avatar},
+            <if test="gender != null and gender != ''">
+                gender = #{gender},
             </if>
+<!--            <if test="avatar != null and avatar != ''">-->
+<!--                avatar = #{avatar},-->
+<!--            </if>-->
             <if test="password != null and password != ''">
                 password = #{password},
             </if>
-            <if test="status != null and status != ''">
-                status = #{status},
-            </if>
-            <if test="loginIp != null and loginIp != ''">
-                login_ip = #{loginIp},
-            </if>
-            <if test="loginDate != null">
-                login_date = #{loginDate},
-            </if>
+<!--            <if test="status != null and status != ''">-->
+<!--                status = #{status},-->
+<!--            </if>-->
+<!--            <if test="loginIp != null and loginIp != ''">-->
+<!--                login_ip = #{loginIp},-->
+<!--            </if>-->
+<!--            <if test="loginDate != null">-->
+<!--                login_date = #{loginDate},-->
+<!--            </if>-->
             <if test="updateBy != null and updateBy != ''">
                 update_by = #{updateBy},
             </if>
-            <if test="remark != null">
-                remark = #{remark},
-            </if>
+<!--            <if test="remark != null">-->
+<!--                remark = #{remark},-->
+<!--            </if>-->
             update_time = sysdate()
         </set>
-        where user_id = #{userId}
+        where id = #{id}
     </update>
 
     <update id="updateUserStatus" parameterType="com.xunmei.system.api.domain.SysUser">