yos框架更新

src/custom/restcontroller/webmanage/hr/hr.java

@@ -31,58 +31,60 @@ public class hr extends Controller {
         /*
         过滤条件设置
        */
-      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("or t1.officetelephone like'%").append(whereObject.getString("condition")).append("%' ");
-              where.append("or t1.position like'%").append(whereObject.getString("condition")).append("%' ");
-              where.append("or t1.hrcode like'%").append(whereObject.getString("condition")).append("%' ");
-              where.append("or t2.depname like'%").append(whereObject.getString("condition")).append("%' ");
-              where.append("or t3.accountno like'%").append(whereObject.getString("condition")).append("%' ");
-              where.append(")");
-          }
-          if (whereObject.containsKey("isworker") && !"".equals(whereObject.getString("isworker"))) {
-          	 where.append(" and t1.isworker ='").append(whereObject.getString("isworker")).append("' ");
-          }
-      }
-      boolean containssub = content.getBoolean("containssub");
-      JSONArray departmentidsArray = content.getJSONArray("departmentids");
-      ArrayList<String> departmentidsList = new ArrayList<>();
-      for (Object o : departmentidsArray) {
-          String departmentid = o.toString();
-          departmentidsList.add(departmentid);
-          if (containssub) {
-              departmentidsList.addAll(getSubDepartmentids(Long.parseLong(departmentid)));
-          }
-      }
+        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("or t1.officetelephone like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.position like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.hrcode like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.depname like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t3.accountno like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("isworker") && !"".equals(whereObject.getString("isworker"))) {
+                where.append(" and t1.isworker ='").append(whereObject.getString("isworker")).append("' ");
+            }
+            if (whereObject.containsKey("addproxy") && !"".equals(whereObject.getString("addproxy"))) {
+                where.append(" and t1.userid !=").append(userid);
+            }
+        }
+        boolean containssub = content.getBoolean("containssub");
+        JSONArray departmentidsArray = content.getJSONArray("departmentids");
+        ArrayList<Long> departmentidsList = new ArrayList<>();
+        for (Object o : departmentidsArray) {
+            long departmentid = Long.parseLong(o.toString());
+            departmentidsList.add(departmentid);
+            if (containssub) {
+                departmentidsList.addAll(Department.getSubDepartmentIds(this, departmentid));
+            }
+        }
+
+        if (content.containsKey("isAll")) {
+            if (content.getBooleanValue("isAll")) {
+                departmentidsList = dbConnect.runSqlQuery("SELECT departmentid from sys_department  WHERE siteid = '" + siteid + "' AND isused").toArrayList("departmentid", new ArrayList<>());
+            }
+        }
+        SQLFactory sqlFactory = new SQLFactory(this, "员工列表查询", pageSize, pageNumber, pageSorting);
+        sqlFactory.addParameter("siteid", siteid);
+        sqlFactory.addParameter_in("departmentid", departmentidsList);
+        sqlFactory.addParameter_SQL("where", where);
+        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        Rows rolerows = dbConnect.runSqlQuery("select t2.rolename,t1.userid from sys_userrole t1 inner join sys_role t2 on t1.siteid=t2.siteid and t1.roleid=t2.roleid where t1.siteid='" + siteid + "'");
+        RowsMap rolerowsMap = rolerows.toRowsMap("userid");
+        for (Row row : rows) {
+            if (!(rolerowsMap.get(row.getString("userid"))).isEmpty()) {
+                row.put("userrole", (rolerowsMap.get(row.getString("userid"))).toJsonArray("rolename"));
+            } else {
+                row.put("userrole", new JSONArray());
+            }
+        }
 
-      if (content.containsKey("isAll")) {
-          if (content.getBooleanValue("isAll")) {
-              departmentidsList = dbConnect.runSqlQuery("SELECT departmentid from sys_department  WHERE siteid = '" + siteid + "' AND isused").toArrayList("departmentid");
-          }
-      }
-      SQLFactory sqlFactory = new SQLFactory(this, "员工列表查询", pageSize, pageNumber, pageSorting);
-      sqlFactory.addParameter("siteid", siteid);
-      sqlFactory.addParameter_in("departmentid", departmentidsList);
-      sqlFactory.addParameter_SQL("where", where);
-      Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-      Rows rolerows = dbConnect.runSqlQuery("select t2.rolename,t1.userid from sys_userrole t1 inner join sys_role t2 on t1.siteid=t2.siteid and t1.roleid=t2.roleid where t1.siteid='" + siteid + "'");
-      RowsMap rolerowsMap = rolerows.toRowsMap("userid");
-      for (Row row : rows) {
-      	//System.out.println(row.getString("userid"));
-          if(!(rolerowsMap.get(row.getString("userid"))).isEmpty()) {
-          	row.put("userrole", (rolerowsMap.get(row.getString("userid"))).toJsonArray("rolename"));
-          } else {
-          	row.put("userrole", new JSONArray());
-			}
-		}
-      
-      return getSucReturnObject().setData(rows).toString();
-  }
+        return getSucReturnObject().setData(rows).toString();
+    }
 
     @API(title = "员工详情查询")
     @CACHEING
@@ -104,11 +106,11 @@ public class hr extends Controller {
             Rows rolerows = dbConnect.runSqlQuery("select t2.rolename,t2.remarks from sys_userrole t1 inner join sys_role t2 on t1.siteid=t2.siteid and t1.roleid=t2.roleid where t1.userid='" + userid + "' and t1.siteid='" + siteid + "'");
             row.put("userrole", rolerows);
         }
-        return getSucReturnObject().setData(rows.isNotEmpty()?rows.get(0):new Row()).toString();
+        return getSucReturnObject().setData(rows.isNotEmpty() ? rows.get(0) : new Row()).toString();
     }
 
     @API(title = "员工新增、修改")
-    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}),@cm(clazz = workorder.class, method = {"query_hrList"})})
+    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}), @cm(clazz = workorder.class, method = {"query_hrList"})})
     public String insertormodify_hr() throws YosException {
         long hrid = content.getLongValue("hrid");//新增时传0
         String hrcode = content.getString("hrcode", "sys_hr");
@@ -126,7 +128,7 @@ public class hr extends Controller {
         long reporthrid = content.getLongValue("reporthrid");
         long hruserid = content.getLongValue("userid");//绑定账号
         long isworker = content.getLongValue("isworker");//是否工人（服务人员）
-        
+
         if (!idcard.equals("") && !idCard_validate(idcard)) {
             return getErrReturnObject().setErrMsg("身份证号" + idcard + "无效").toString();
         }
@@ -154,6 +156,7 @@ public class hr extends Controller {
             addusersql.addParameter("createby", username);
             addusersql.addParameter("changeuserid", userid);
             addusersql.addParameter("isworker", isworker);
+            addusersql.addParameter("status", content.getStringValue("status", false, "0"));
 
             content.put("hrid", hrid);
             sqllist.add(addusersql.getSQL());
@@ -179,7 +182,8 @@ public class hr extends Controller {
             modifyusersql.addParameter("changeby", username);
             modifyusersql.addParameter("changeuserid", userid);
             modifyusersql.addParameter("isworker", isworker);
-            
+            modifyusersql.addParameter("status", content.getStringValue("status", false, "0"));
+
             sqllist.add(modifyusersql.getSQL());
 
             isrefresh = dbConnect.runSqlQuery("select * from sys_hr where siteid='" + siteid + "' and hrid='" + hrid + "' and departmentid='" + departmentid + "'").isEmpty();
@@ -192,7 +196,7 @@ public class hr extends Controller {
     }
 
     @API(title = "删除员工信息", apiversion = R.ID20221102090403.v1.class)
-    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}),@cm(clazz = workorder.class, method = {"query_hrList"})})
+    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}), @cm(clazz = workorder.class, method = {"query_hrList"})})
     public String deleteHr() throws YosException {
         JSONArray hrids = content.getJSONArray("hrids");
         StringBuffer str = new StringBuffer("(0");
@@ -206,7 +210,7 @@ public class hr extends Controller {
     }
 
     @API(title = "为员工创建新的账号")
-    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}),@cm(clazz = workorder.class, method = {"query_hrList"})})
+    @CACHEING_CLEAN(cms = {@cm(clazz = hr.class, method = {"query_hrList", "query_hrMain"}), @cm(clazz = workorder.class, method = {"query_hrList"})})
     public String createUser() throws YosException {
         long hrid = content.getLongValue("hrid");
         Rows rows = dbConnect.runSqlQuery("select * from sys_hr where siteid='" + siteid + "' and hrid=" + hrid);
@@ -228,4 +232,4 @@ public class hr extends Controller {
         }
         return result;
     }
-}
+}

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -355,6 +355,50 @@ public class Item extends Controller {
                     where.append(")");
                 }
             }
+            if (whereObject.containsKey("itemno") && !"".equals(whereObject.getString("itemno"))) {
+                where.append(" and(");
+                where.append("t1.itemno like '%").append(whereObject.getString("itemno")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("itemname") && !"".equals(whereObject.getString("itemname"))) {
+                where.append(" and(");
+                where.append("t1.itemname like '%").append(whereObject.getString("itemname")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("packageqty") && !"".equals(whereObject.getString("packageqty"))) {
+                where.append(" and(");
+                where.append("t1.packageqty ='").append(whereObject.getString("packageqty")).append("' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("unitname") && !"".equals(whereObject.getString("unitname"))) {
+                where.append(" and(");
+                where.append("t2.unitname like '%").append(whereObject.getString("status")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("price1") && !"".equals(whereObject.getString("price1"))) {
+                where.append(" and(");
+                where.append("t9.price ='").append(whereObject.getString("price1")).append("' ");
+                where.append(")");
+            }   if (whereObject.containsKey("price2") && !"".equals(whereObject.getString("price2"))) {
+                where.append(" and(");
+                where.append("t10.price ='").append(whereObject.getString("price2")).append("' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("price3") && !"".equals(whereObject.getString("price3"))) {
+                where.append(" and(");
+                where.append("t11.price ='").append(whereObject.getString("price3")).append("' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("price4") && !"".equals(whereObject.getString("price4"))) {
+                where.append(" and(");
+                where.append("t12.price ='").append(whereObject.getString("price4")).append("' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("financeclasstype") && !"".equals(whereObject.getString("financeclasstype"))) {
+                where.append(" and(");
+                where.append("t1.financeclasstype like '%").append(whereObject.getString("financeclasstype")).append("%' ");
+                where.append(")");
+            }
 
 
             if (whereObject.containsKey("itemclassid") &&  !"".equals(whereObject.getString("itemclassid"))) {

src/custom/restcontroller/webmanage/saletool/courseware/coursewareauth.java

@@ -18,7 +18,7 @@ public class coursewareauth extends Controller {
         super(content);
     }
 
-    @API(title = "新增")
+    @API(title = "新增", intervaltime = 2000)
     public String insert() throws YosException {
         boolean isonlymanager_dept = content.getBoolean("isonlymanager_dept");
         boolean isonlymanager_agent = content.getBoolean("isonlymanager_agent");
@@ -30,11 +30,11 @@ public class coursewareauth extends Controller {
         key = "departmentid";
         if (content.containsKey(key)) {
             JSONArray departmentids = content.getJSONArray("departmentid");
-            ArrayList<String> tempDepartmentids = new ArrayList<>();
+            ArrayList<Long> tempDepartmentids = new ArrayList<>();
             for (Object value : departmentids) {
-                tempDepartmentids.addAll(getSubDepartmentids(Long.valueOf(value.toString())));
+                tempDepartmentids.addAll(Department.getSubDepartmentIds(this, Long.parseLong(value.toString())));
             }
-            content.put("departmentid",tempDepartmentids);
+            content.put("departmentid", tempDepartmentids);
             sqlList.addAll(getSqlList(key, sat_coursewareid, isonlymanager_dept, "删除多余部门授权", "内部"));
         }
 
@@ -50,9 +50,10 @@ public class coursewareauth extends Controller {
             JSONArray ids = content.getJSONArray("sa_saleareaid");
             ArrayList<Long> temp = new ArrayList<>();
             for (Object value : ids) {
-                temp.addAll(SaleArea.getSubSaleAreaIds(this,Long.valueOf(value.toString())));
+                temp.add(Long.valueOf(value.toString()));
+                temp.addAll(SaleArea.getSubSaleAreaIds(this, Long.parseLong(value.toString())));
             }
-            content.put("sa_saleareaid",temp);
+            content.put("sa_saleareaid", temp);
             sqlList.addAll(getSqlList(key, sat_coursewareid, isonlymanager_agent, "删除多余经销商区域授权", "外部"));
         }
 
@@ -93,7 +94,7 @@ public class coursewareauth extends Controller {
      * @return
      */
     public String getUpdateSql(boolean isonlymanager, Long sat_coursewareid, String key, Object value) {
-        return "UPDATE sat_courseware_auth SET isonlymanager=" + isonlymanager + " WHERE sat_coursewareid = " + sat_coursewareid + " AND " + key + " = " + value;
+        return "UPDATE sat_courseware_auth SET isonlymanager=" + isonlymanager + " WHERE siteid='" + siteid + "' and  sat_coursewareid = " + sat_coursewareid + " AND " + key + " = " + value;
     }
 
     /**
@@ -124,6 +125,7 @@ public class coursewareauth extends Controller {
     public String getDeleteSqlStr(String SQLMODELNAME, Long sat_coursewareid, String key, Object value) throws YosException {
         SQLFactory sqlFactory = new SQLFactory(this, SQLMODELNAME);
         sqlFactory.addParameter("sat_coursewareid", sat_coursewareid);
+        sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter_in(key, value);
         return sqlFactory.getSQL();
     }
@@ -218,14 +220,14 @@ public class coursewareauth extends Controller {
      * 简单封装，返回查询授权sql
      */
     public String getSelectSql(Long sat_coursewareid, String key) {
-        return "SELECT distinct " + key + " FROM sat_courseware_auth  where  sat_coursewareid = '" + sat_coursewareid + "' AND " + key + " is not null";
+        return "SELECT distinct " + key + " FROM sat_courseware_auth  where siteid='" + siteid + "' and  sat_coursewareid = '" + sat_coursewareid + "' AND " + key + " is not null";
     }
 
     /**
      * 简单封装，返回查询是否负责人sql
      */
     public String getSelectIsonlymanagerSql(Long sat_coursewareid, String key) {
-        return "SELECT isonlymanager FROM sat_courseware_auth  where  sat_coursewareid = '" + sat_coursewareid + "' AND " + key + " is not null LIMIT 1";
+        return "SELECT isonlymanager FROM sat_courseware_auth  where siteid='" + siteid + "' and  sat_coursewareid = '" + sat_coursewareid + "' AND " + key + " is not null LIMIT 1";
     }
 
 

src/custom/restcontroller/webmanage/saletool/notice/noticeauth.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.notice;
 
+import beans.department.Department;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -15,15 +16,15 @@ import restcontroller.R;
 import java.util.ArrayList;
 
 @API(title = "通告-范围授权")
-public class noticeauth extends Controller{
+public class noticeauth extends Controller {
 
-	public noticeauth(JSONObject arg0) throws YosException {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
+    public noticeauth(JSONObject arg0) throws YosException {
+        super(arg0);
+        // TODO Auto-generated constructor stub
+    }
 
-    @API(title = "新增",apiversion = R.ID20221101142003.v1.class)
-    public String createNoticeAuth() throws YosException{
+    @API(title = "新增", apiversion = R.ID20221101142003.v1.class, intervaltime = 2000)
+    public String createNoticeAuth() throws YosException {
         boolean isonlymanager_dept = content.getBoolean("isonlymanager_dept");
         boolean isonlymanager_agent = content.getBoolean("isonlymanager_agent");
 //        String areatype = content.getString("areatype");
@@ -36,9 +37,9 @@ public class noticeauth extends Controller{
         if (content.containsKey("departmentid")) {
             JSONArray departmentidArray = content.getJSONArray("departmentid");
 
-            ArrayList<String> tempDepartmentids = new ArrayList<>();
+            ArrayList<Long> tempDepartmentids = new ArrayList<>();
             for (Object value : departmentidArray) {
-                tempDepartmentids.addAll(getSubDepartmentids(Long.valueOf(value.toString())));
+                tempDepartmentids.addAll(Department.getSubDepartmentIds(this, Long.parseLong(value.toString())));
             }
 
             for (Object obj : tempDepartmentids) {
@@ -46,7 +47,7 @@ public class noticeauth extends Controller{
                 String id = obj.toString();
                 String insertsql = getInsertSql(isonlymanager_dept, "内部", sat_noticeid, id, "null", "null", "null", sql);
                 sqlList.add(insertsql);
-                sqlList.add("UPDATE sat_notice_auth SET isonlymanager="+isonlymanager_dept+" WHERE sat_noticeid = "+sat_noticeid+" AND departmentid = "+id);
+                sqlList.add("UPDATE sat_notice_auth SET isonlymanager=" + isonlymanager_dept + " WHERE sat_noticeid = " + sat_noticeid + " AND departmentid = " + id);
             }
 
             SQLFactory sqlFactory = new SQLFactory(this, "删除多余部门授权");
@@ -75,11 +76,12 @@ public class noticeauth extends Controller{
 
         //营销区域
         if (content.containsKey("sa_saleareaid")) {
-            JSONArray ids = content.getJSONArray("sa_saleareaid");
+            JSONArray sa_saleareaidArray = content.getJSONArray("sa_saleareaid");
 
             ArrayList<Long> temp = new ArrayList<>();
-            for (Object value : ids) {
-                temp.addAll(SaleArea.getSubSaleAreaIds(this,Long.valueOf(value.toString())));
+            for (Object value : sa_saleareaidArray) {
+                temp.add(Long.valueOf(value.toString()));
+                temp.addAll(SaleArea.getSubSaleAreaIds(this, Long.parseLong(value.toString())));
             }
 
             for (Object obj : temp) {
@@ -87,7 +89,7 @@ public class noticeauth extends Controller{
                 String id = obj.toString();
                 String insertsql = getInsertSql(isonlymanager_agent, "外部", sat_noticeid, "null", "null", id, "null", sql);
                 sqlList.add(insertsql);
-                sqlList.add("UPDATE sat_notice_auth SET isonlymanager="+isonlymanager_agent+" WHERE sat_noticeid = "+sat_noticeid+" AND sa_saleareaid = "+id);
+                sqlList.add("UPDATE sat_notice_auth SET isonlymanager=" + isonlymanager_agent + " WHERE sat_noticeid = " + sat_noticeid + " AND sa_saleareaid = " + id);
 
             }
             SQLFactory sqlFactory = new SQLFactory(this, "删除多余经销商区域授权");
@@ -119,8 +121,8 @@ public class noticeauth extends Controller{
         return getSucReturnObject().toString();
     }
 
-    @API(title = "更新",apiversion = R.ID20221101142103.v1.class)
-    public String update() throws YosException{
+    @API(title = "更新", apiversion = R.ID20221101142103.v1.class)
+    public String update() throws YosException {
         Long id = content.getLong("sat_notice_authid");
         Boolean isonlymanager = content.getBoolean("isonlymanager");
         String begSql = "UPDATE sat_notice_auth SET changedate=CURRENT_TIME,changeby = '" + username + "',isonlymanager = " + isonlymanager + "";
@@ -129,19 +131,19 @@ public class noticeauth extends Controller{
         String sql = "";
         if (content.containsKey("departmentid")) {
             Long departmentid = content.getLong("departmentid");
-            updateSql+= ",departmentid = " + departmentid;
+            updateSql += ",departmentid = " + departmentid;
         }
         if (content.containsKey("hrid")) {
             Long hrid = content.getLong("hrid");
-            updateSql+= ",hrid = " + hrid;
+            updateSql += ",hrid = " + hrid;
         }
         if (content.containsKey("sa_saleareaid")) {
             Long sa_saleareaid = content.getLong("sa_saleareaid");
-            updateSql+= ",sa_saleareaid = " + sa_saleareaid;
+            updateSql += ",sa_saleareaid = " + sa_saleareaid;
         }
         if (content.containsKey("sa_agentsid")) {
             Long sa_agentsid = content.getLong("sa_agentsid");
-            updateSql+= ",sa_agentsid = " + sa_agentsid;
+            updateSql += ",sa_agentsid = " + sa_agentsid;
         }
 
         sql = begSql + updateSql + endSql;
@@ -149,26 +151,26 @@ public class noticeauth extends Controller{
         return getSucReturnObject().toString();
     }
 
-    @API(title = "删除",apiversion = R.ID20221101142203.v1.class)
-    public String delete() throws YosException{
-    	
-    	JSONArray sat_notice_authids = content.getJSONArray("sat_notice_authids");
-		BatchDeleteErr batchDeleteErr = BatchDeleteErr.create(this, sat_notice_authids.size());
-		for (Object o : sat_notice_authids) {
-			long sat_notice_authid = Long.parseLong(o.toString());
-		
-			ArrayList<String> list = new ArrayList<>();
-			
-			String deletesql = "DELETE FROM sat_notice_auth WHERE sat_notice_authid = '" + sat_notice_authid + "'";
-			list.add(deletesql);
-			dbConnect.runSqlUpdate(list);
-		}
-		return batchDeleteErr.getReturnObject().toString();
+    @API(title = "删除", apiversion = R.ID20221101142203.v1.class)
+    public String delete() throws YosException {
+
+        JSONArray sat_notice_authids = content.getJSONArray("sat_notice_authids");
+        BatchDeleteErr batchDeleteErr = BatchDeleteErr.create(this, sat_notice_authids.size());
+        for (Object o : sat_notice_authids) {
+            long sat_notice_authid = Long.parseLong(o.toString());
+
+            ArrayList<String> list = new ArrayList<>();
+
+            String deletesql = "DELETE FROM sat_notice_auth WHERE sat_notice_authid = '" + sat_notice_authid + "'";
+            list.add(deletesql);
+            dbConnect.runSqlUpdate(list);
+        }
+        return batchDeleteErr.getReturnObject().toString();
 
     }
 
-    @API(title = "查询",apiversion = R.ID20221101142303.v1.class)
-    public String queryNoticeAuth() throws YosException{
+    @API(title = "查询", apiversion = R.ID20221101142303.v1.class)
+    public String queryNoticeAuth() throws YosException {
         Long sat_noticeid = content.getLong("sat_noticeid");
 
         //部门
@@ -234,5 +236,4 @@ public class noticeauth extends Controller{
     }
 
 
-
 }

src/custom/restcontroller/webmanage/saletool/salematerial/salematerialAuth.java

@@ -1,8 +1,8 @@
 package restcontroller.webmanage.saletool.salematerial;
 
+import beans.department.Department;
 import beans.remind.Remind;
 import beans.salearea.SaleArea;
-import beans.user.User;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -11,7 +11,6 @@ import common.annotation.API;
 import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
-import utility.email.EmailContent;
 
 import java.util.ArrayList;
 
@@ -22,7 +21,7 @@ public class salematerialAuth extends Controller {
     }
 
 
-    @API(title = "新增")
+    @API(title = "新增", intervaltime = 2000)
     public String insertOrUpdate() throws YosException {
         boolean isonlymanager_dept = content.getBoolean("isonlymanager_dept");
         boolean isonlymanager_agent = content.getBoolean("isonlymanager_agent");
@@ -44,11 +43,11 @@ public class salematerialAuth extends Controller {
         key = "departmentid";
         if (content.containsKey(key)) {
             JSONArray departmentids = content.getJSONArray("departmentid");
-            ArrayList<String> tempDepartmentids = new ArrayList<>();
+            ArrayList<Long> tempDepartmentids = new ArrayList<>();
             for (Object value : departmentids) {
-                tempDepartmentids.addAll(getSubDepartmentids(Long.valueOf(value.toString())));
+                tempDepartmentids.addAll(Department.getSubDepartmentIds(this, Long.parseLong(value.toString())));
             }
-            content.put("departmentid",tempDepartmentids);
+            content.put("departmentid", tempDepartmentids);
             sqlList.addAll(getSqlList(key, attachmentid, isonlymanager_dept, "删除多余部门授权", "内部"));
         }
         //用户
@@ -62,9 +61,10 @@ public class salematerialAuth extends Controller {
             JSONArray ids = content.getJSONArray("sa_saleareaid");
             ArrayList<Long> temp = new ArrayList<>();
             for (Object value : ids) {
-                temp.addAll(SaleArea.getSubSaleAreaIds(this,Long.valueOf(value.toString())));
+                temp.addAll(SaleArea.getSubSaleAreaIds(this, Long.parseLong(value.toString())));
+                temp.add(Long.parseLong(value.toString()));
             }
-            content.put("sa_saleareaid",temp);
+            content.put("sa_saleareaid", temp);
             sqlList.addAll(getSqlList(key, attachmentid, isonlymanager_agent, "删除多余经销商区域授权", "外部"));
         }
 
@@ -103,9 +103,6 @@ public class salematerialAuth extends Controller {
                     remind.setObjectname("sys_attachment");
                     remind.setObjectid(id);
                     remind.sendByDialogMsg().createSys_message();
-
-                    remind.setToemail(User.getUserMailAddress(this, tempUserid));
-                    remind.sendByMail();
                 }
             }
         }

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

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.sharematerial;
 
+import beans.department.Department;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -17,7 +18,7 @@ public class sharematerialAuth extends Controller {
         super(content);
     }
 
-    @API(title = "新增")
+    @API(title = "新增", intervaltime = 2000)
     public String insertOrUpdate() throws YosException {
         boolean isonlymanager_dept = content.getBoolean("isonlymanager_dept");
         boolean isonlymanager_agent = content.getBoolean("isonlymanager_agent");
@@ -30,9 +31,9 @@ public class sharematerialAuth extends Controller {
         if (content.containsKey("departmentid")) {
             JSONArray departmentidArray = content.getJSONArray("departmentid");
 
-            ArrayList<String> tempDepartmentids = new ArrayList<>();
+            ArrayList<Long> tempDepartmentids = new ArrayList<>();
             for (Object value : departmentidArray) {
-                tempDepartmentids.addAll(getSubDepartmentids(Long.valueOf(value.toString())));
+                tempDepartmentids.addAll(Department.getSubDepartmentIds(this, Long.parseLong(value.toString())));
             }
             for (Object obj : tempDepartmentids) {
                 String sql = defSqlStr + "' AND departmentid = '" + obj + "' limit 1";
@@ -67,11 +68,12 @@ public class sharematerialAuth extends Controller {
 
         //用户
         if (content.containsKey("sa_saleareaid")) {
-            JSONArray ids = content.getJSONArray("sa_saleareaid");
+            JSONArray sa_saleareaidArray = content.getJSONArray("sa_saleareaid");
 
             ArrayList<Long> temp = new ArrayList<>();
-            for (Object value : ids) {
-                temp.addAll(SaleArea.getSubSaleAreaIds(this,Long.valueOf(value.toString())));
+            for (Object value : sa_saleareaidArray) {
+                temp.add(Long.valueOf(value.toString()));
+                temp.addAll(SaleArea.getSubSaleAreaIds(this, Long.parseLong(value.toString())));
             }
 
             for (Object obj : temp) {

src/custom/restcontroller/webmanage/saletool/submitedit/submiteditauth.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.submitedit;
 
+import beans.department.Department;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -18,7 +19,7 @@ public class submiteditauth extends Controller {
         super(content);
     }
 
-    @API(title = "提报范围授权",apiversion = R.ID20221102094302.v1.class)
+    @API(title = "提报范围授权", apiversion = R.ID20221102094302.v1.class)
     public String insertOrUpdate() throws YosException {
         boolean isonlymanager_dept = content.getBoolean("isonlymanager_dept");
         boolean isonlymanager_agent = content.getBoolean("isonlymanager_agent");
@@ -31,9 +32,9 @@ public class submiteditauth extends Controller {
         if (content.containsKey("departmentid")) {
             JSONArray departmentidArray = content.getJSONArray("departmentid");
 
-            ArrayList<String> tempDepartmentids = new ArrayList<>();
+            ArrayList<Long> tempDepartmentids = new ArrayList<>();
             for (Object value : departmentidArray) {
-                tempDepartmentids.addAll(getSubDepartmentids(Long.valueOf(value.toString())));
+                tempDepartmentids.addAll(Department.getSubDepartmentIds(this, Long.parseLong(value.toString())));
             }
 
             for (Object obj : tempDepartmentids) {
@@ -41,7 +42,7 @@ public class submiteditauth extends Controller {
                 String id = obj.toString();
                 String insertsql = getInsertSql(isonlymanager_dept, "内部", sat_submiteditmodelid, id, "null", "null", "null", sql);
                 sqlList.add(insertsql);
-                sqlList.add("UPDATE sat_submiteditmodel_auth SET isonlymanager="+isonlymanager_dept+" WHERE sat_submiteditmodelid = "+sat_submiteditmodelid+" AND departmentid = "+id);
+                sqlList.add("UPDATE sat_submiteditmodel_auth SET isonlymanager=" + isonlymanager_dept + " WHERE sat_submiteditmodelid = " + sat_submiteditmodelid + " AND departmentid = " + id);
             }
             SQLFactory sqlFactory = new SQLFactory(this, "删除多余部门授权");
             sqlFactory.addParameter("sat_submiteditmodelid", sat_submiteditmodelid);
@@ -69,11 +70,12 @@ public class submiteditauth extends Controller {
 
         //营销区域
         if (content.containsKey("sa_saleareaid")) {
-            JSONArray ids = content.getJSONArray("sa_saleareaid");
+            JSONArray sa_saleareaidArray = content.getJSONArray("sa_saleareaid");
 
             ArrayList<Long> temp = new ArrayList<>();
-            for (Object value : ids) {
-                temp.addAll(SaleArea.getSubSaleAreaIds(this,Long.valueOf(value.toString())));
+            for (Object value : sa_saleareaidArray) {
+                temp.add(Long.valueOf(value.toString()));
+                temp.addAll(SaleArea.getSubSaleAreaIds(this, Long.valueOf(value.toString())));
             }
 
             for (Object obj : temp) {
@@ -81,7 +83,7 @@ public class submiteditauth extends Controller {
                 String id = obj.toString();
                 String insertsql = getInsertSql(isonlymanager_agent, "外部", sat_submiteditmodelid, "null", "null", id, "null", sql);
                 sqlList.add(insertsql);
-                sqlList.add("UPDATE sat_submiteditmodel_auth SET isonlymanager="+isonlymanager_agent+" WHERE sat_submiteditmodelid = "+sat_submiteditmodelid+" AND sa_saleareaid = "+id);
+                sqlList.add("UPDATE sat_submiteditmodel_auth SET isonlymanager=" + isonlymanager_agent + " WHERE sat_submiteditmodelid = " + sat_submiteditmodelid + " AND sa_saleareaid = " + id);
             }
             SQLFactory sqlFactory = new SQLFactory(this, "删除多余经销商区域授权");
             sqlFactory.addParameter("sat_submiteditmodelid", sat_submiteditmodelid);
@@ -150,7 +152,7 @@ public class submiteditauth extends Controller {
 //
 //    }
 
-    @API(title = "查询提报授权范围",apiversion = R.ID20221102094602.v1.class)
+    @API(title = "查询提报授权范围", apiversion = R.ID20221102094602.v1.class)
     public String selectAuth() throws YosException {
         Long sat_submiteditmodelid = content.getLong("sat_submiteditmodelid");
 //        //type：1：部门，2：用户，3：营销区域，4：经销商