恢复验证码识别

下级已办待办查询BUG修复
Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api
2026-02-28 09:09:38 +08:00 · 2026-02-28 09:06:03 +08:00 · 2026-02-27 17:07:50 +08:00 · 2026-02-27 17:07:44 +08:00
3 changed files with 269 additions and 197 deletions
--- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java
@ -9,9 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAbnList;
-import com.chinaweal.aiccs.aiccs.abnormal.entity.dto.ToIncludeAbnDto;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.excel.AbnListExcel;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.vo.XyxfCqDto;
 import com.chinaweal.aiccs.aiccs.abnormal.mapper.TSBizRemListMapper;
@ -34,9 +32,8 @@ import com.chinaweal.aiccs.aiccs.business.service.WorkFlowService;
 import com.chinaweal.aiccs.aiccs.fraudreg.entity.TFraudCheck;
 import com.chinaweal.aiccs.aiccs.fraudreg.service.ITFraudCheckService;
 import com.chinaweal.aiccs.aiccs.market.entity.TSUsualInspect;
-import com.chinaweal.aiccs.aiccs.market.service.ITSUsualInspectService;
-import com.chinaweal.aiccs.aiccs.market.entity.TSSueInspect;
 import com.chinaweal.aiccs.aiccs.market.service.ITSSueInspectService;
+import com.chinaweal.aiccs.aiccs.market.service.ITSUsualInspectService;
 import com.chinaweal.aiccs.aiccs.system.entity.DeadlineStas;
 import com.chinaweal.aiccs.aiccs.system.service.DeadlinestasService;
 import com.chinaweal.aiccs.common.base.controller.BaseController;
@ -51,11 +48,8 @@ import com.chinaweal.aiccs.org.service.TUsersService;
 import com.chinaweal.aiccs.outside.service.SMSServiceImpl;
 import com.chinaweal.aiccs.outside.service.TfRevokeServicelmpl;
 import com.chinaweal.aicorg.model.AICUser;
-import com.chinaweal.aicorg.pojo.AICPermission;
-import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException;
 import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto;
 import com.chinaweal.youfool.framework.springboot.rest.RestResult;
-import com.chinaweal.youfool.framework.springboot.rest.ResultCode;
 import com.chinaweal.youfool.framework.springboot.util.AssertUtils;
 import com.chinaweal.youfool.framework.sso.util.SSOUtil;
 import io.swagger.annotations.ApiOperation;
@ -69,7 +63,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@ -304,13 +297,15 @@ public class TaskController extends BaseController {
                    case "12":
                        taskListUnionDto.setBusname(tsBizRemListMapper.queryLerep(taskListUnionDto.getBizseqid()));
                        break;
-                    default: break;
+                    default:
+                        break;
                }
            }
            if (BaseDataConstant.MARKET_INSPECT.equals(taskListUnionDto.getBustype())) {
                TSUsualInspect tsUsualInspect = itsUsualInspectService.getById(taskListUnionDto.getBizseqid());
                // 回退待核查
-                if (tsUsualInspect != null && StringUtils.isNotBlank(tsUsualInspect.getBackOpinion())) taskListUnionDto.setCurrentNodeOrBizStatus("bak-startInspect");
+                if (tsUsualInspect != null && StringUtils.isNotBlank(tsUsualInspect.getBackOpinion()))
+                    taskListUnionDto.setCurrentNodeOrBizStatus("bak-startInspect");
            }
            if (taskListUnionDto.getDeadlineDate() != null) {
                Date startDate = new DateTime(taskListUnionDto.getDeadlineDate());
@ -496,6 +491,14 @@ public class TaskController extends BaseController {
            }
        }

+        if (customParamMap != null && customParamMap.containsKey("childUnitSwitch")) {
+            String myOrgNumber = StringUtils.clearRegionZero(curUser.getRegionID());
+            if (StringUtils.isNotBlank(myOrgNumber)) {
+                customParamMap.put("myOrgNumber", myOrgNumber);
+                customParamMap.put("myOrgNumberLike", myOrgNumber + "%");
+            }
+        }
+
        // 获取已办分页
        IPage<TaskListUnionDto> page = taskListService.searchFinishTaskUnionPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), taskListParam, customParamMap);

@ -909,6 +912,7 @@ public class TaskController extends BaseController {
    /**
     * 综合查询
     * 经营异常名录查询
+     *
     * @param pageRequestDto
     * @param request
     * @return
@ -927,6 +931,7 @@ public class TaskController extends BaseController {
    /**
     * 综合查询
     * 经营异常名录查询
+     *
     * @param pageRequestDto
     * @param request
     * @return
@ -1048,10 +1053,11 @@ public class TaskController extends BaseController {

    /**
     * 信用修复预警待办分析
-     * @author ymc
-     * @since 2024年8月1日 11:53
+     *
     * @param pageRequestDto
     * @return
+     * @author ymc
+     * @since 2024年8月1日 11:53
     */
    @RequestMapping("/repairTaskQuery")
    public RestResult<?> repairTaskQuery(@RequestBody PageRequestDto pageRequestDto) {
@ -1068,11 +1074,12 @@ public class TaskController extends BaseController {

    /**
     * 导出信用修复待办
-     * @author ymc
-     * @since 2024年8月5日 15:41
+     *
     * @param pageRequestDto
     * @param request
     * @return
+     * @author ymc
+     * @since 2024年8月5日 15:41
     */
    @PostMapping("exportRepairTask")
    public void exportRepairTask(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException {
@ -1095,6 +1102,7 @@ public class TaskController extends BaseController {
    /**
     * 综合查询
     * 信用修复超期查询
+     *
     * @param pageRequestDto
     * @param request
     * @return
@ -1120,6 +1128,7 @@ public class TaskController extends BaseController {
    /**
     * 综合查询
     * 经营异常名录查询
+     *
     * @param pageRequestDto
     * @param request
     * @return
--- a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
+++ b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
@ -294,9 +294,9 @@ public class UserController extends BaseController {
        // 验证码校验
        String realCaptcha = (String) request.getSession().getAttribute("captchadl");
        request.getSession().removeAttribute("captchadl");
-//        if (!captchadl.equalsIgnoreCase(realCaptcha)) {
-//            return RestResult.error(ResultCode.USER_NOT_LOGGED_IN, "登录验证码错误");
-//        }
+        if (!captchadl.equalsIgnoreCase(realCaptcha)) {
+            return RestResult.error(ResultCode.USER_NOT_LOGGED_IN, "登录验证码错误");
+        }

        TUsers tUsers = usersService.selectTusersByUsername(phone);
        if (tUsers == null) {
--- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
@ -573,9 +573,24 @@
                    SELECT
                    DISTINCT WORKFLOWID
                    FROM
-                    tsopinion
-                    WHERE
-                    HANDLERID = #{customParamMap.userId}) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
+                    tsopinion tso
+                    <where>
+                        <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
+                            <choose>
+                                <when test='customParamMap.childUnitSwitch eq "1"'>
+                                    and (
+                                    tso.HANDLERID = #{customParamMap.userId}
+                                    or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
+                                    where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
+                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+                                    ))
+                                </when>
+                                <otherwise>
+                                    and tso.HANDLERID = #{customParamMap.userId}
+                                </otherwise>
+                            </choose>
+                        </if>
+                    </where>) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
                union all
                    (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , n.currentNode as currentNodeOrBizStatus ,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, t.CREATETIME
                    from tsrevtasklist t
@ -584,22 +599,70 @@
                    SELECT
                    DISTINCT WORKFLOWID
                    FROM
-                    tsopinion
-                    WHERE
-                    HANDLERID = #{customParamMap.userId}) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
+                    tsopinion tso
+                    <where>
+                        <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
+                            <choose>
+                                <when test='customParamMap.childUnitSwitch eq "1"'>
+                                    and (
+                                    tso.HANDLERID = #{customParamMap.userId}
+                                    or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
+                                    where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
+                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+                                    ))
+                                </when>
+                                <otherwise>
+                                    and tso.HANDLERID = #{customParamMap.userId}
+                                </otherwise>
+                            </choose>
+                        </if>
+                    </where>
+                    ) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
                union all
                </when>
            </choose>
            (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME
            from tsrevtasklist t, tsbizrevlist b
            where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0'
-            and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion where HANDLERID = #{customParamMap.userId}))
+            and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion tso
+            <where>
+                <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
+                    <choose>
+                        <when test='customParamMap.childUnitSwitch eq "1"'>
+                            and (
+                            tso.HANDLERID = #{customParamMap.userId}
+                            or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
+                            where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
+                            and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+                            ))
+                        </when>
+                        <otherwise>
+                            and tso.HANDLERID = #{customParamMap.userId}
+                        </otherwise>
+                    </choose>
+                </if>
+            </where>))
        union all
            (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME
            from TSTaskList ta
            LEFT JOIN TSTwfProcessNode n on ta.WorkflowID = n.processid
            where ta.BUSSTATUS in ('-1', '0', '1', '3', '5')
-            and n.CURRUSERID = #{customParamMap.userId})
+            <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
+                <choose>
+                    <when test='customParamMap.childUnitSwitch eq "1"'>
+                        and (
+                        n.CURRUSERID = #{customParamMap.userId}
+                        or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
+                        where n.CURRUSERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
+                        and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+                        ))
+                    </when>
+                    <otherwise>
+                        and n.CURRUSERID = #{customParamMap.userId}
+                    </otherwise>
+                </choose>
+            </if>
+        )
        ) m
        <where>
            <if test="customParamMap != null">
Author	SHA1	Message	Date
黎润豪	654a400dce	恢复验证码识别	2026-02-28 09:09:38 +08:00
黎润豪	411bbfc6c1	下级已办待办查询BUG修复	2026-02-28 09:06:03 +08:00
黎润豪	048059e46b	Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api	2026-02-27 17:07:50 +08:00
黎润豪	0f901b0bf6	下级已办待办查询	2026-02-27 17:07:44 +08:00