Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateObjectController.java

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.evaluate.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.DeleteMark;
@@ -100,6 +101,9 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         Date createDate = new Date();
         long createUserId = StpUtil.getLoginIdAsLong();
         for (AddEvaluateObjectDto objectDto : dto.getObjectList()) {
+            if(StrUtil.isEmpty(objectDto.getObjectId())){
+               continue;
+            }
             EvaluateObject evaluateObject = new EvaluateObject();
             evaluateObject.setObjectId(Long.parseLong(objectDto.getObjectId()));
             evaluateObject.setEvaluateManageId(Long.parseLong(dto.getEvaluateManageId()));

src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -42,7 +42,7 @@
         LEFT JOIN evaluate_executer t2 ON t1.id = t2.evaluate_manage_id
         LEFT JOIN evaluate_template t3 ON t3.id = t1.evaluate_template_id
         LEFT JOIN xjr_dictionary_detail t4 ON t4.code = t3.evaluate_type AND t4.item_id = 1746831039385366530
-        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t1.status = 1
         and t2.status = #{dto.status} and t2.user_id = #{dto.loginUserId}
     </select>
     <select id="getWriteInfo" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWriteVo">