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

src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -88,13 +88,14 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         sub.setAuditTime(null);
         sub.setAuditUserName(null);
         sub.setAuditUserId(null);
-
+        sub.setRemark("");
         sysUserBankCardService.updateById(sub);
         SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
         sysUserBankCardHistory.setBankNumber(sysUserBankCard.getBankNumber());
         sysUserBankCardHistory.setType("unbind");
         sysUserBankCardHistory.setCreateTime(new Date());
         sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
+        sysUserBankCardHistory.setBankNumberUserId(sysUserBankCard.getId());
         sysUserBankCardHistoryService.save(sysUserBankCardHistory);
     }
 

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -463,6 +463,11 @@ public class InsPlyIncome implements Serializable {
     private String operationStatus;
 
 
+    @ApiModelProperty("是否外部订单")
+    @TableField(exist = false)
+    private String isExternal;
+
+
     public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDateTime createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;
         this.policyno = policyno;

src/main/resources/mapper/modules/admin/SysUserLinkAreaMapper.xml

@@ -82,10 +82,10 @@
            sd.management_source = 2
             <if test="areaCodes != null and areaCodes.size>0" >
                 AND (
-                <foreach collection="areaCodes" item="item" open=" instr( " separator="||" close=") ">
-                   su.dept_id, TRIM( TRAILING '0' FROM #{item} )
+                <foreach collection="areaCodes" item="item" open=" (" separator="or" close=") ">
+                    instr( su.dept_id, TRIM( TRAILING '0' FROM #{item} ))>0
                 </foreach>
-                ) > 0
+                )
             </if>
     </select>
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -161,6 +161,7 @@
         pa.agreement_name  as "agreementName",
         pa.agreement_type  as "agreementType",
         pa.docking_person  as "dockingPerson",
+        pa.is_external  as "isExternal",
         upf.url as "imageUrl",
         su.name  as "userName",
         b.name as "deptName",
@@ -198,9 +199,6 @@
             <if test="noReceivableProportion !=null  and  noReceivableProportion  !=''">
                 and a.no_receivable_proportion =#{noReceivableProportion}
             </if>
-
-
-
             <if test="id !=null  and  id  !=''">
                 and a.id =#{id}
             </if>