Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java

@@ -12,6 +12,7 @@ import com.bonus.flowable.service.BusinessService;
 import com.bonus.flowable.utils.FlowTaskUtils;
 import com.bonus.system.api.RemoteUserService;
 import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.A;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -57,6 +58,11 @@ public class BusinessController {
         if (StringUtils.isNotBlank(auditTask.getTaskId())){
             taskIdArr = auditTask.getTaskId().split(",");
         }
+//        if(uuidArr.length!=taskIdArr.length){
+//            return AjaxResult.error("数据异常,请联系管理员进行处理!");
+//        }
+
+        //TODO -异常bug -未发现是怎么回显 数组越界
         AjaxResult code = null;
         for (int i = 0; i < uuidArr.length; i++) {
             auditTask.setUuid(uuidArr[i]);

bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml

@@ -407,7 +407,6 @@
         replace into nxdt_ii.pt_check_person_remark(
             task_id, user_id,type,version,audit_status,remark,audit_time,audit_remark
         )values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now(),#{reason})
-
     </insert>
 
     <select id="getCommentListByProcessInstanceId" resultType="com.bonus.flowable.entity.CheckComment">

bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml

@@ -374,12 +374,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         lkc.pro_id AS proId,
         lkc.cont_uuid AS contUuid,
         lkc.cons_persion_id AS consPersonId,
-        lkc.cont_uuid AS contUuid,
         lkc.sub_uuid AS subUuid,
         lkc.admission_date AS admissionDate,
         lkc.departure_date AS departureDate,
         lkc.out_status as intoStatus,
-        #{dataType}  as status,
+        #{bean.dataType}  as status,
         lkc.task_id_out AS taskId,
         lkc.proc_inst_id_out as procInsId,
         pcp.cons_user_id AS consUserId,
@@ -401,11 +400,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         lkc.exit_reason as reason
         FROM
         lk_cont_person lkc
-        LEFT JOIN
-        pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
-        AND pcp.is_active = '1'
+        LEFT JOIN  pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
         left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status ='0'
-        WHERE  lkc.into_status  = '3' AND lkc.out_status != '0'
+        WHERE  lkc.into_status  = '3' AND lkc.out_status != '0'  AND pcp.is_active = '1'
         <if test="bean.proId != null and bean.proId != ''">
             and lkc.pro_id = #{bean.proId}
         </if>