Merge branch 'master_after20' into master_cj_zq

@@ -41,5 +41,13 @@
                 AND tb.type = #{vo.type}
             </if>
         </where>
+        ORDER BY
+        CASE factory_code
+        WHEN 'yfc' THEN 1
+        WHEN 'efc' THEN 2
+        WHEN 'sfc' THEN 3
+        WHEN 'ztfc' THEN 4
+        ELSE 999
+        END;
     </select>
 </mapper>

@@ -79,7 +79,7 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
         vo1.setCustomerId(vo.getCustomerId());
         vo1.setCompany(vo.getCompany());
-        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        vo1.setMaterialTypeId(normalizeMaterialTypeIds(vo.getMaterialTypeId()));
         List<ContractFramework> query = this.query(vo1);
         if (CollectionUtils.isNotEmpty(query)) {
             // 过滤掉当前 ID 的记录，看是否还有其他记录
@@ -96,7 +96,7 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
                 .set(ContractFramework::getCompany, vo.getCompany())
                 .set(ContractFramework::getHasFrameworkAgreement, vo.getHasFrameworkAgreement())
                 .set(ContractFramework::getValidityTime, vo.getValidityTime())
-                .set(ContractFramework::getMaterialTypeId, vo.getMaterialTypeId())
+                .set(ContractFramework::getMaterialTypeId, normalizeMaterialTypeIds(vo.getMaterialTypeId()))
                 .eq(ContractFramework::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
@@ -112,7 +112,7 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
         vo1.setCustomerId(vo.getCustomerId());
         vo1.setCompany(vo.getCompany());
-        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        vo1.setMaterialTypeId(normalizeMaterialTypeIds(vo.getMaterialTypeId()));
         List<ContractFramework> query = this.query(vo1);
         if (CollectionUtils.isNotEmpty(query)) {
             throw new DefaultClientException("已经存在相同的框架合同！");
@@ -124,7 +124,7 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         data.setCompany(vo.getCompany());
         data.setHasFrameworkAgreement(vo.getHasFrameworkAgreement());
         data.setValidityTime(vo.getValidityTime());
-        data.setMaterialTypeId(vo.getMaterialTypeId());
+        data.setMaterialTypeId(normalizeMaterialTypeIds(vo.getMaterialTypeId()));
 
         getBaseMapper().insert(data);
 
@@ -173,4 +173,15 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
     public void cleanCacheByKey(Serializable key) {
 
     }
+
+    public static String normalizeMaterialTypeIds(String materialTypeIds) {
+        if (StringUtils.isBlank(materialTypeIds)) {
+            return "";
+        }
+        return Arrays.stream(materialTypeIds.split(","))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .sorted() // 关键：排序
+                .collect(Collectors.joining(","));
+    }
 }