Merge remote-tracking branch 'origin/develop-yellow' into develop2

src/custom/restcontroller/webmanage/saletool/sharematerial/DesignPic.java

@@ -357,7 +357,7 @@ public class DesignPic extends Controller {
         //1:全国精选
         if (!iscollect && querytype == 1) {
             where.append(" and (");
-            where.append("t1.isnationwide ='").append(content.getString("isnationwide")).append("' ");
+            where.append("t1.isnationwide ='1' ");
             where.append(")");
 
         }

src/custom/restcontroller/webmanage/saletool/store/StoreAgent.java

@@ -326,12 +326,39 @@ public class StoreAgent extends Controller {
     @API(title = "选择负责人（添加门店人员）", apiversion = R.ID20240410142002.v1.class)
     public String chooseLeader() throws YosException {
 
+        StringBuffer where = new StringBuffer(" 1=1 ");
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and (");
+                where.append("t1.name like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.phonenumber like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
+                String storerolename = Parameter.get("storerolename");
+                if (whereObject.getString("status").equals("启用")) {
+                    where.append(" and (");
+                    where.append("t1.userid in (").append("SELECT t1.userid FROM sys_userrole t1 INNER JOIN sys_role t2 ON t1.roleid=t2.roleid AND t2.siteid=t1.siteid WHERE t2.rolename='" + storerolename + "'").append(") ");
+                    where.append(")");
+                }
+                if (whereObject.getString("status").equals("停用")) {
+                    where.append(" and (");
+                    where.append("t1.userid not in (").append("SELECT t1.userid FROM sys_userrole t1 INNER JOIN sys_role t2 ON t1.roleid=t2.roleid AND t2.siteid=t1.siteid WHERE t2.rolename='" + storerolename + "'").append(") ");
+                    where.append(")");
+                }
+
+            }
+
+        }
+
         Long sa_storeid = content.getLongValue("sa_storeid");
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sys_enterprise_hr"
                         , "sys_enterprise_hrid", "name", "position", "phonenumber", "isleader", "userid")
                 .setTableAlias("t1");
         querySQL.setSiteid(siteid);
+        querySQL.setWhere(where);
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere(" not exists(select 1 from sa_store where leader_hrid=t1.sys_enterprise_hrid and sa_storeid=" + sa_storeid + " and siteid='" + siteid + "')");
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);