1.修复单据类型导入失败问题

src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java

@@ -51,13 +51,6 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
         int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
         PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
         List<CustomerDetailEntity> customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest);
-        for (int i = 0; i < customerDetailEntities.size(); i++) {
-            CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i);
-            if (!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId() != null) {
-
-            }
-
-        }
         return customerDetailEntities;
     }
 

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -59,74 +59,30 @@
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         insert
             ignore
-        into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit,
+        into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, innerOrder,
-                                   innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd,
+                                   secCheckEnable, checkEnable, checkUdims, checkPdaEd, checkPdaUn, checkPc,
-                                   checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims,
+                                   checkWebNew, checkSp, checkChange, secCheckUdims, secCheckPdaEd, secCheckPdaUn,
-                                   secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
+                                   secCheckPc, secCheckWebNew, secCheckChange, secCheckSp, corpType,
-                                   secCheckChange, secCheckSp, corpType, supplementOrderType,
+                                   supplementOrderType, checkBalance, secCheckBalance, useDyCount, expireTip,
-                                   checkBalance, secCheckBalance, useDyCount, expireTip, updateTime,
+                                   updateTime, defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
-                                   defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
                                    entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
-                                   checkCopy, secCheckCopy, originAction, changeEnable,
+                                   preInBack, supplementAll, createUser, createTime, updateUser, vailDispatch,
-                                   spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
+                                   vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew,
-                                   vailGroupBuy, busType, inStock, actionType
+                                   thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
-                , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp
+                                   thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
-                , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire)
+                                   checkExpire, checkCertExpire)
-        values (#{mainAction},
+        values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
-                #{action},
+                #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
-                #{name},
+                #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
-                #{enable},
+                #{secCheckPc}, #{secCheckWebNew}, #{secCheckChange}, #{secCheckSp}, #{corpType},
-                #{remark},
+                #{supplementOrderType}, #{checkBalance}, #{secCheckBalance}, #{useDyCount}, #{expireTip},
-                #{thirdSysFk},
+                #{updateTime}, #{defaultUnit}, #{prefix}, #{outToSpms}, #{ullageFill}, #{scanPreIn}, #{vailInv},
-                #{genUnit},
+                #{entrutSpms}, #{codeFillCheck}, #{defaultSubInv}, #{defaultInv}, #{orderVisibleType},
-                #{innerOrder},
+                #{preInBack}, #{supplementAll}, #{createUser}, #{createTime}, #{updateUser}, #{vailDispatch},
-                #{secCheckEnable},
+                #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew},
-                #{checkEnable},
+                #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
-                #{checkUdims},
+                #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
-                #{checkPdaEd},
+                #{checkExpire}, #{checkCertExpire})
-                #{checkPdaUn},
-                #{checkPc},
-                #{checkWebNew},
-                #{checkSp},
-                #{checkChange},
-                #{secCheckUdims},
-                #{secCheckPdaEd},
-                #{secCheckPdaUn},
-                #{secCheckPc},
-                #{secCheckWebNew},
-                #{secCheckChange},
-                #{secCheckSp},
-                #{corpType},
-                #{supplementOrderType},
-                #{checkBalance},
-                #{secCheckBalance},
-                #{useDyCount},
-                #{expireTip},
-                #{updateTime},
-                #{defaultUnit},
-                #{prefix},
-                #{outToSpms},
-                #{ullageFill},
-                #{scanPreIn},
-                #{vailInv},
-                #{entrutSpms},
-                #{codeFillCheck},
-                #{defaultSubInv},
-                #{defaultInv},
-                #{orderVisibleType},
-                #{checkCopy},
-                #{secCheckCopy},
-                #{originAction},
-                #{changeEnable},
-                #{spUse},
-                #{preIn},
-                #{supplementAll},
-                #{createUser},
-                #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}
-                       , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
-                #{thrCheckPc}
-                       , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
-                       , #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -182,8 +138,7 @@
     <select id="selectForThirdSys" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         select action, name
         from basic_bussiness_type
-        where action not in (
+        where action not in (select code
-                select code
                              from thr_system_bus_api)
     </select>
 
@@ -318,5 +273,4 @@
             </if>
         </where>
     </select>
-
 </mapper>