Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -1202,6 +1202,22 @@ public class BmsSupplierController {
                 return supplier;
             }).collect(Collectors.toList());
             bmsSupplierService.updateBatchById(updateBmsSuppliers);
+
+            List<String> updateBmsSuppliersUserNullById = updateList.stream()
+                    .filter(a->!StringUtils.hasText(a.getMainHeadCode()))
+                    .map(a-> codeToSupplierId.get(a.getCustomerCode())).collect(Collectors.toList());
+
+            if(updateBmsSuppliersUserNullById.size()>0){
+                bmsSupplierService.updateBmsSuppliersUserNullById(updateBmsSuppliersUserNullById);
+            }
+
+            List<String> updateBmsSuppliersOtherUserNullById = updateList.stream()
+                    .filter(a->!StringUtils.hasText(a.getMinorHeadCodes()))
+                    .map(a-> codeToSupplierId.get(a.getCustomerCode())).collect(Collectors.toList());
+
+            if(updateBmsSuppliersOtherUserNullById.size()>0){
+                bmsSupplierService.updateBmsSuppliersOtherUserNullById(updateBmsSuppliersOtherUserNullById);
+            }
         }
         /** ----------------------------------------------------------------------------------- */
         /** -------------------------------  删除数据  ------------------------------------------------ */

src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java

@@ -22,5 +22,11 @@ public interface BmsSupplierMapper extends BaseMapper<BmsSupplier> {
     @Update("update bms_supplier set user_id = null,user_code = null, user_name = null where id = #{supplierId}")
     int removeRelateUserInfo(@Param("supplierId") Long supplierId);
 
+    @InterceptorIgnore(tenantLine = "1")
+    void updateBmsSuppliersUserNullById(@Param("list") List<String> ids);
+
+    @InterceptorIgnore(tenantLine = "1")
+    void updateBmsSuppliersOtherUserNullById(@Param("list") List<String> ids);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java

@@ -38,5 +38,9 @@ public interface BmsSupplierService extends IService<BmsSupplier> {
 
     void flashParentId();
 
+    void updateBmsSuppliersUserNullById(List<String> ids);
+
+    void updateBmsSuppliersOtherUserNullById(List<String> ids);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -14,6 +14,7 @@ import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
@@ -279,5 +280,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         supplier.setRegion2Last(currentRegion.getId());
     }
 
+    public void updateBmsSuppliersUserNullById(List<String> ids){
+        this.baseMapper.updateBmsSuppliersUserNullById(ids);
+    }
+
+    public void updateBmsSuppliersOtherUserNullById(List<String> ids){
+        this.baseMapper.updateBmsSuppliersOtherUserNullById(ids);
+    }
 }
 

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -175,4 +175,22 @@
         ORDER BY `bms_supplier`.`update_time` DESC
     </select>
 
+
+    <update id="updateBmsSuppliersUserNullById">
+        UPDATE bms_supplier
+        SET user_id = NULL,user_code = null, user_name = null
+        WHERE id IN
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateBmsSuppliersOtherUserNullById">
+        UPDATE bms_supplier
+        SET other_user_id = NULL,other_user_codes = null, other_user_names = null
+        WHERE id IN
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>