1、取消复制配置弹窗业务员和部门权限限制

2、修复床垫清单部分配置重复问题

JLHHJSvr/DataStore/web_mattress_choose.xml

@@ -62,12 +62,12 @@ FROM u_mattress
 	<when notnull="@arg_deptid">
 		u_mattress.deptid = @arg_deptid
 	</when>
-	<when $user_deptstr!="-1">
+	<!-- <when $user_deptstr!="-1">
 		u_mattress.createby in ($$user_outrepstr$$)
 	</when>
 	<when $user_deptstr!="-1">
 		u_mattress.deptid in ($$user_deptstr$$)
-	</when>
+	</when> -->
 	<when notnull="@arg_search">
 		EXISTS (SELECT 1 FROM dbo.SC_SPLIT(@arg_search, ',') A WHERE A.Item <> '' AND (u_mattress.mattresscode LIKE '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressrelcode like '%'+LTRIM(RTRIM(A.Item))+'%' OR u_mattress.mattressname like '%'+LTRIM(RTRIM(A.Item))+'%')) OR EXISTS (SELECT 1 FROM u_mtrldef WHERE usermtrlmode LIKE '%' + @arg_search + '%')
 	</when>

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -1399,7 +1399,7 @@ namespace JLHHJSvr.Helper
                 // 保证清单列表类别一致，从面裥绵 -> V侧3
                 foreach (var mx in jianmianList)
                 {
-                    if (mx.mtrlid > 0 && (item.Key.Equals(mx.chastr) || item.Key.Contains("_EMPTY")) && item.Value.Contains(mx.formulakind.Value))
+                    if (mx.mtrlid > 0 && (item.Key.Equals(mx.chastr) || (string.IsNullOrEmpty(mx.chastr) && item.Key.Contains("_EMPTY"))) && item.Value.Contains(mx.formulakind.Value))
                     {
                         if (mx.formulakind == 0 || mx.formulakind == 1 || mx.formulakind == 2 || mx.formulakind == 3 || mx.formulakind == 4)
                         {