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

src/main/java/com/glxp/api/controller/sup/CustomerController.java

@@ -113,6 +113,10 @@ public class CustomerController {
         List<AuthRoleAdmin> objects = new ArrayList<>();
         if( byCustomerld !=null && byCustomerld.size()>0){
             for (AuthAdmin authAdmin : byCustomerld) {
+                //修改关联的用户状态
+                authAdmin.setUserFlag(customerDetailEntity.getUserFlag());
+                authAdminService.updateAuthAdmin(authAdmin);
+
                 List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(authAdmin.getId());
                 if(authRoleAdmins!=null && authRoleAdmins.size()>0) {
                     authRoleAdmin.setRole_id(Long.valueOf(customerDetailEntity.getRoleId()));

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
      * @return
      */
     String selectActionByBillNo(@Param("billNo") String billNo);
+
+
 }

src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inv.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -142,7 +143,11 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
-        response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        if (order!=null){
+            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+//        response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss"));
     }
 
     @Override

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

@@ -509,7 +509,6 @@
                basic_products.sfwblztlcp,
                basic_products.cgzmraqxgxx,
                basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -556,4 +556,6 @@
             </otherwise>
         </choose>
     </select>
+
+
 </mapper>