金融产品政策部分代码

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5141,8 +5141,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //推送车款
                     createCarFin(vo, busSalesOrder);
                 }
-
-
                 //-----------------推送车款款项结束
                 //推送采购渠道待选择
                 BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -389,22 +389,25 @@ public class FlowableRest implements FlowableFeign {
         boolean isChange = false;
         String firstName = "";
         String firstSid = "";
+        String changeName = "";
         if (StringUtils.isBlank(nextUserSid)) {
             ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
             if (!nextNodeUserSidsOfSubmit.getSuccess()) {
-//                return rb.setMsg("nextUserSid 不能为空！");
+                //下一环节用户为空的情况
-                //=================================添加系统个管理员自动审批
                 nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
                 adminContains = true;
             } else {
                 nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid();
                 formVariables.put(BusinessVariables.ORGPATH, nextNodeUserSidsOfSubmit.getData().getOrgPath());
+                //下一环节不为空，查询下一环节用户是否有转办人
                 if (nextUserSid != null) {
                     List<String> nextUserList = Arrays.asList(nextUserSid.split(","));
                     if (nextUserList.size() == 1) {
+                        //下一环节用户sid
                         firstSid = nextUserList.get(0);
                         ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid);
                         if (sysUserVoResultBean.getData() != null) {
+                            //下一环节用户名称
                             firstName = sysUserVoResultBean.getData().getName();
                         }
                         SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery();
@@ -413,7 +416,10 @@ public class FlowableRest implements FlowableFeign {
                         ResultBean<SysFlowableConfigVvo> sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery);
                         if (sysFlowableConfigVvoResultBean.getData() != null) {
                             if (StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())) {
+                                //转办人sid
                                 nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid();
+                                //转办人名称
+                                changeName = sysFlowableConfigVvoResultBean.getData().getChangeName();
                                 isChange = true;
                             }
                         }
@@ -422,6 +428,7 @@ public class FlowableRest implements FlowableFeign {
 
             }
         } else {
+            //若下一环节用户与系统管理员一致，则自动审批
             if (ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextUserSid)) {
                 adminContains = true;
             }
@@ -442,6 +449,7 @@ public class FlowableRest implements FlowableFeign {
         if (StringUtils.isBlank(businessSid)) {
             return rb.setMsg("业务sid 不能为空！");
         }
+        //查询任务id为taskId的任务是否存在
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         if (Objects.isNull(task)) {
             return rb.setMsg("任务不存在");
@@ -454,7 +462,7 @@ public class FlowableRest implements FlowableFeign {
         String taskDefKey = "";
         vo.setSid(businessSid);
 
-        if (DelegationState.PENDING.equals(task.getDelegationState())) {
+        if (DelegationState.PENDING.equals(task.getDelegationState())) {//加签
             taskService.addComment(taskId, instanceId,
                     FlowComment.DELEGATE.getType(), comment);
             taskService.resolveTask(taskId, formVariables);
@@ -469,15 +477,11 @@ public class FlowableRest implements FlowableFeign {
             if (ll.getData().size() > 0) {
                 LatestTaskVo latestTaskVo = ll.getData().get(0);
                 String id_ = latestTaskVo.getId_();
-                if(isChange){//添加评论
+                if (isChange) {//若下一环节用户存在转办人则添加评论
-                    ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(nextUserSid);
                     ProcessCommentDto processCommentDto = new ProcessCommentDto();
                     processCommentDto.setReviewerSid(firstSid);
-                    if(sysUserVoResultBean.getData() != null){
-                        String changeName = sysUserVoResultBean.getData().getName();
                     processCommentDto.setReviewer(firstName);
                     processCommentDto.setContent("交" + changeName + "转办");
-                    }
                     processCommentDto.setTime(new Date());
                     processCommentDto.setProcessId(dto.getInstanceId());
                     processCommentService.saveOrUpdateDto(processCommentDto);
@@ -494,7 +498,7 @@ public class FlowableRest implements FlowableFeign {
                 vo.setNodeState(FlowComment.SETTLE.getRemark());
             }
         }
-        if (adminContains) {
+        if (adminContains) {//若下一环节用户与系统管理员一致，则自动审批
             dto.setUserSid(nextUserSid);
             dto.setTaskId(vo.getTaskId());
             dto.setTaskDefKey(taskDefKey);
@@ -516,7 +520,7 @@ public class FlowableRest implements FlowableFeign {
                         UserTask userTask = (UserTask) flowElement2;
                         List<String> candidateGroups = userTask.getCandidateGroups();
                         //根据角色查询用户
-                        for (String roleSid : candidateGroups) {
+                        /*for (String roleSid : candidateGroups) {
                             UserQuery userQuery = new UserQuery();
                             userQuery.setRoleSid(roleSid);
                             userQuery.setOrgSidPath(dto.getOrgSidPath());
@@ -526,6 +530,13 @@ public class FlowableRest implements FlowableFeign {
                                 continue;
                             }
                             sysUserVoLists2.addAll(userByRole.getData());
+                        }*/
+                        UserssQuery userssQuery = new UserssQuery();
+                        userssQuery.setCandidateGroups(candidateGroups);
+                        userssQuery.setOrgSidPath(dto.getOrgSidPath());
+                        sysUserVoLists2 = sysUserFeign.getUsersByRoles(userssQuery).getData();
+                        if (sysUserVoLists2 == null) {
+                            sysUserVoLists2 = new ArrayList<>();
                         }
                     }
                 }
@@ -534,7 +545,7 @@ public class FlowableRest implements FlowableFeign {
                     List<String> candidateGroups = userTask.getCandidateGroups();
                     List<SysUserVo> sysUserVoLists = new ArrayList<>();
                     //根据角色查询用户
-                    for (String roleSid : candidateGroups) {
+                   /* for (String roleSid : candidateGroups) {
                         UserQuery userQuery = new UserQuery();
                         userQuery.setRoleSid(roleSid);
                         userQuery.setOrgSidPath(dto.getOrgSidPath());
@@ -544,6 +555,13 @@ public class FlowableRest implements FlowableFeign {
                             continue;
                         }
                         sysUserVoLists.addAll(userByRole.getData());
+                    }*/
+                    UserssQuery userssQuery = new UserssQuery();
+                    userssQuery.setCandidateGroups(candidateGroups);
+                    userssQuery.setOrgSidPath(dto.getOrgSidPath());
+                    sysUserVoLists = sysUserFeign.getUsersByRoles(userssQuery).getData();
+                    if (sysUserVoLists == null) {
+                        sysUserVoLists = new ArrayList<>();
                     }
                     //当前环节运营部总经理 刘丽艳  点击同意 下一环节 事业部副总经理 （nextUserSid） 和事业部总经理（sysUserVoLists.get(0).getSid()）
                     //判断查询回来的用户的集合size是1  并且用户的sid和下一环节的用户的sid相同。
@@ -579,6 +597,7 @@ public class FlowableRest implements FlowableFeign {
 
     /**
      * 未添加系统管理员自动审批功能
+     *
      * @param dto
      * @param b   是否连续跳转环节
      * @return

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVvo.java

@@ -14,4 +14,6 @@ public class SysFlowableConfigVvo implements Vo {
     private static final long serialVersionUID = -3291554285219440731L;
     @ApiModelProperty("转办人sid")
     private String changeUserSid;
+    @ApiModelProperty("转办人名称")
+    private String changeName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -199,6 +199,10 @@ public interface SysUserFeign {
     @GetMapping(value = "getUserByRole")
     ResultBean<List<SysUserVo>> getUserByRole(@SpringQueryMap UserQuery query);
 
+    @ApiOperation(value = "获取本机构链角色的用户")
+    @PostMapping(value = "getUsersByRoles")
+    ResultBean<List<SysUserVo>> getUsersByRoles(@RequestBody UserssQuery usersQuery);
+
     /**
      * 参数：当前用户角色sid，部门sid
      *

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -186,6 +186,11 @@ public class SysUserFeignFallback implements SysUserFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<SysUserVo>> getUsersByRoles(UserssQuery usersQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<SysUserVo>> getUserByOrgRole(UserRoleQuery query) {
 		return null;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserssQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.portal.api.sysuser;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/10
+ **/
+@Data
+public class UserssQuery {
+
+    private List<String> candidateGroups = new ArrayList<>();
+
+    private String orgSidPath;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -605,6 +605,11 @@ public class SysUserRest implements SysUserFeign {
         return sysUserService.getUserByRole(query);
     }
 
+    @Override
+    public ResultBean<List<SysUserVo>> getUsersByRoles(UserssQuery usersQuery) {
+        return sysUserService.getUsersByRoles(usersQuery);
+    }
+
     @Override
     public ResultBean<List<SysUserVo>> getUserByOrgRole(UserRoleQuery query) {
         return sysUserService.getUserByOrgRole(query);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -1118,6 +1118,43 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         return rb.success().setData(sysUserVoList);
 
 
+    }
+
+    public ResultBean<List<SysUserVo>> getUsersByRoles(UserssQuery usersQuery) {
+        ResultBean<List<SysUserVo>> rb = ResultBean.fireFail();
+        List<SysUserVo> sysUserVoList = new ArrayList<>();
+        List<String> candidateGroups = usersQuery.getCandidateGroups();
+        candidateGroups.removeAll(Collections.singleton(null));
+        String orgSidPath = usersQuery.getOrgSidPath();
+        if (!candidateGroups.isEmpty()) {
+            for (String roleSid : candidateGroups) {
+                //根据角色sid获取角色的层级
+                String levelTypeKey = sysRoleService.getLevelType(roleSid);
+                if (StringUtils.isNotBlank(levelTypeKey)) {
+                    if (orgSidPath.split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
+                        String levelOrgSid = orgSidPath.split("/")[Integer.parseInt(levelTypeKey) - 1];
+                        sysUserVoList = baseMapper.getUserByRole(roleSid, levelOrgSid);
+                        if (sysUserVoList.size() > 1) {
+                            List<String> stringList = sysUserVoList.stream().map(v -> v.getSid()).collect(Collectors.toList());
+                            List<SysUserVo> sysUserVoList1 = baseMapper.getUserMessageByRole(roleSid, levelOrgSid, stringList);
+                            sysUserVoList1.removeAll(Collections.singleton(null));
+                            if (sysUserVoList1.size() > 0) {
+                                sysUserVoList = sysUserVoList1;
+                            }
+                        }
+                    }
+                    sysUserVoList.removeAll(Collections.singleton(null));
+                    sysUserVoList.forEach(t -> {
+                        t.setOrgSidPath(orgSidPath);
+                    });
+                } else {
+                    return rb.setMsg("该角色层级未设置").setData(sysUserVoList);
+                }
+            }
+        }
+        return rb.success().setData(sysUserVoList);
+
+
     }
 
     public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java

@@ -113,4 +113,8 @@ public interface LoanFinBankFeign {
     @ApiOperation("手机端查询资方的列表")
     @PostMapping("/selectAppFinBankList")
     public ResultBean<PagerVo<AppResultData>> selectAppFinBankList(@RequestBody PagerQuery<LoanFinBankQuery> pq);
+
+    @ApiOperation("产品政策查询资方下拉框")
+    @GetMapping("/selectListByOrgPath")
+    ResultBean<List<LoanFinBanksVo>> selectListByOrgPath(@RequestParam("orgPath") String orgPath);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java

@@ -70,4 +70,9 @@ public class LoanFinBankFeignFallback implements LoanFinBankFeign {
         return ResultBean.fireFail().setMsg("接口anrui-base/basefinbank/selectAppFinBankList无法访问");
     }
 
+    @Override
+    public ResultBean<List<LoanFinBanksVo>> selectListByOrgPath(String orgPath) {
+        return null;
+    }
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBanksVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loanfinbank;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/10
+ **/
+@Data
+public class LoanFinBanksVo implements Vo {
+    private static final long serialVersionUID = -2396821681988455147L;
+
+    private String sid;
+
+    private String name;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java

@@ -74,7 +74,7 @@ public class LoanFinPolicyDto implements Dto {
     @ApiModelProperty("有效期至")
     private String validDateTo;
     @ApiModelProperty("是否有其他融：1有，0无")
-    private int isOtherProduct;
+    private boolean isOtherProduct;
     @ApiModelProperty("全组织路径")
     private String orgPath;
     @ApiModelProperty("适用销售部门List")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java

@@ -70,7 +70,7 @@ public class LoanFinPolicyVo implements Vo {
     @ApiModelProperty("有效期至")
     private String validDateTo;
     @ApiModelProperty("是否有其他融：1有，0无")
-    private int isOtherProduct;
+    private boolean isOtherProduct;
     @ApiModelProperty("适用销售部门sids(逗号分隔)")
     private String useDeptSids;
     @ApiModelProperty("适用销售部门名称(逗号分隔)")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class LoanFinPolicyVos implements Vo {
     private static final long serialVersionUID = 7126087240752513932L;
-
+    private String sid;
     @ApiModelProperty("报备状态")
     private String filingStateValue;
     @ApiModelProperty("风控状态")
@@ -52,5 +52,5 @@ public class LoanFinPolicyVos implements Vo {
     @ApiModelProperty("名义/留购价款")
     private String nominalPrice;
     @ApiModelProperty("是否有其他融")
-    private int isOtherProduct;
+    private boolean isOtherProduct;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankExportVo;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo;
 import com.yxt.common.core.result.AppResultData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -85,4 +86,6 @@ public interface LoanFinBankMapper extends BaseMapper<LoanFinBank> {
 
     @Update("update loan_fin_bank set isDelete = 1 where sid =#{sid}")
     int updateBySidDelete(String sid);
+
+    List<LoanFinBanksVo> selectListByOrgSid(String orgSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml

@@ -72,4 +72,10 @@
         FROM loan_fin_bank bb
             ${ew.customSqlSegment}
     </select>
+
+    <select id="selectListByOrgSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo">
+        select sid, bankShortName name
+        from loan_fin_bank
+        where createOrgSid = #{orgSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.riskcenter.biz.loanfinbank;
 
-import com.yxt.anrui.base.api.basefinbank.*;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -171,4 +168,9 @@ public class LoanFinBankRest implements LoanFinBankFeign {
         PagerVo<AppResultData> pv = loanFinBankService.selectAppFinBankList(pq);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<List<LoanFinBanksVo>> selectListByOrgPath(String orgPath) {
+        return loanFinBankService.selectListByOrgPath(orgPath);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +41,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
 //    private LoanFinPolicyService loanFinPolicyService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
         LoanFinBankQuery query = pq.getParams();
@@ -210,4 +214,12 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
         BeanUtil.copyProperties(loanFinBank, vo);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<List<LoanFinBanksVo>> selectListByOrgPath(String orgPath) {
+        ResultBean<List<LoanFinBanksVo>> rb = ResultBean.fireFail();
+        String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<LoanFinBanksVo> list = baseMapper.selectListByOrgSid(orgSid);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -2,7 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyMapper">
     <select id="pagerList" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVos">
-        select lfp.*
+        select lfp.sid,
+               case lfp.filingState
+                   when 1 then '已报备'
+                   when 2 then '报备中'
+                   when 0 then '未报备' end as filingStateValue,
+               case lfp.riskState
+                   when 1 then '禁用'
+                   when 0 then '正常'
+                   end                   as riskStateValue,
+               case lfp.useSate
+                   when 1 then '禁用'
+                   when 0 then '正常'
+                   end                   as useSateValue,
+               lfp.validDateTo,
+               lfp.useOrgName,
+               lfp.useDeptNames,
+               lfp.policyName,
+               lfp.busTypeValue,
+               lfp.vehCategoryValue,
+               lfp.vehTypeValue,
+               lfp.period,
+               lfp.yearRatio,
+               lfp.serviceAmountTypeKey,
+               lfp.serviceAmount,
+               lfp.downPayRatioLeast,
+               lfp.vehAccidentAmount,
+               lfp.depositPremium,
+               lfp.depositSettle,
+               lfp.nominalPrice,
+               case lfp.isOtherProduct
+                   when 1 then true
+                   when 0 then false
+                   end                   as isOtherProduct
         from loan_fin_policy lfp
                  left join loan_fin_otherpolicy lfop on lfp.sid = lfop.mainPolicySid
         <where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -74,8 +74,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             loanFinPolicy.setCreateOrgName(useOrgName);
             loanFinPolicy.setCreateBySid(dto.getUserSid());
             loanFinPolicy.setOrgSidPath(orgPath);
-            baseMapper.insert(loanFinPolicy);
+            if (dto.isOtherProduct()) {
-            if (dto.getIsOtherProduct() == 1) {
+                loanFinPolicy.setIsOtherProduct(1);
                 LoanFinOtherPolicy loanFinOtherPolicy = new LoanFinOtherPolicy();
                 BeanUtil.copyProperties(dto, loanFinOtherPolicy, "sid");
                 LoanFinOtherPolicyDto loanFinOtherPolicyDto = dto.getLoanFinOtherPolicy();
@@ -88,7 +88,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 loanFinOtherPolicy.setUseOrgName(useOrgName);
                 loanFinOtherPolicy.setCreateOrgName(useOrgName);
                 loanFinOtherPolicyService.insert(loanFinOtherPolicy);
+            } else {
+                loanFinPolicy.setIsOtherProduct(0);
             }
+            baseMapper.insert(loanFinPolicy);
         } else {
             LoanFinPolicy loanFinPolicy = fetchBySid(sid);
             if (loanFinPolicy == null) {
@@ -109,10 +112,11 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 loanFinPolicy.setUseDeptNames("");
                 loanFinPolicy.setUseDeptSids("");
             }
-            baseMapper.updateById(loanFinPolicy);
+            if (!dto.isOtherProduct()) {
-            if (dto.getIsOtherProduct() == 0) {
+                loanFinPolicy.setIsOtherProduct(0);
                 loanFinOtherPolicyService.deleteyMainSid(sid);
             } else {
+                loanFinPolicy.setIsOtherProduct(1);
                 LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(sid);
                 if (loanFinOtherPolicy == null) {
                     BeanUtil.copyProperties(dto, loanFinOtherPolicy, "sid");
@@ -132,6 +136,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                     loanFinOtherPolicyService.insert(loanFinOtherPolicy);
                 }
             }
+            baseMapper.updateById(loanFinPolicy);
         }
         return rb.success();
     }
@@ -145,12 +150,15 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         }
         BeanUtil.copyProperties(loanFinPolicy, loanFinPolicyVo);
         if (loanFinPolicy.getIsOtherProduct() == 1) {
+            loanFinPolicyVo.setOtherProduct(true);
             LoanFinOtherPolicyVo loanFinOtherPolicyVo = new LoanFinOtherPolicyVo();
             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(sid);
             if (loanFinOtherPolicy != null) {
                 BeanUtil.copyProperties(loanFinOtherPolicy, loanFinOtherPolicyVo);
                 loanFinPolicyVo.setLoanFinOtherPolicy(loanFinOtherPolicyVo);
             }
+        } else {
+            loanFinPolicyVo.setOtherProduct(false);
         }
         return rb.success().setData(loanFinPolicyVo);
     }
@@ -197,7 +205,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 privilegeQuery.setMenuUrl(query.getMenuUrl());
                 privilegeQuery.setUserSid(query.getUserSid());
                 ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-                if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                     //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
                     String orgSidPath = query.getOrgPath();
                     orgSidPath = orgSidPath + "/";