服务人员列表接口逻辑变更

src/custom/restcontroller/webmanage/role/role.java

@@ -233,7 +233,6 @@ public class role extends Controller {
         querySQL.addJoinTable(JOINTYPE.inner, "sys_systemclient", "t2", "t1.systemid = t2.systemid and t2.isused = 1","systemclientname");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_systemmodule", "t3", "t2.systemclientid = t3.systemclientid and t3.isused = 1","systemmodulename");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_systemapp", "t4", "t3.systemmoduleid = t4.systemmoduleid and t4.isused = 1 and t4.isneedauth = 1","systemappid","systemappname","remarks");
-        querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.isused = 1");
         querySQL.setWhere("exists(select optionid from sys_systemapp_options where systemappid = t4.systemappid)");
         querySQL.setWhere(where.toString());

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务人员列表查询.sql

@@ -1,26 +1,19 @@
-select t1.hrid,
-       t1.hrcode,
+select t1.userid,
        t1.name,
-       t1.sex,
        t1.createby,
        t1.createdate,
        t1.changeby,
+       t1.remarks,
        t1.changedate,
        t1.phonenumber,
-       t1.officetelephone,
-       t2.depname,
-       t1.position,
-       t1.isleader,
-       t1.isworker,
-       t3.status,
-       t1.email,
-       t4.name        as reporthrname,
-       t3.userid,
-       t3.phonenumber as userphonenumber,
-       t3.name        as username,
-       t3.accountno
-from sys_hr t1
-         inner join sys_department t2 on t1.siteid = t2.siteid and t1.departmentid = t2.departmentid
-         left join sys_users t3 on t1.userid = t3.userid
-         left join sys_hr t4 on t1.siteid = t4.siteid and t1.reporthrid = t4.hrid
-where t1.siteid = $siteid$ and t1.isworker=1 and $where$
+       t1.status,
+       t1.accountno,
+       t2.siteid,
+       t2.usertype
+from sys_users t1
+         inner join sys_usersite t2 on t1.userid = t2.userid and t2.siteid = $siteid$
+         inner join sys_enterprise_hr t4 on t1.userid = t4.userid
+where exists(select 1 from sys_hr where userid =t1.userid and isworker=1)  and $where$
+  and t1.status!='DELETED'
+group by t1.userid, t1.name, t1.createby, t1.createdate, t1.changeby, t1.remarks,
+    t1.changedate, t1.phonenumber, t1.status, t1.accountno, t2.siteid, t2.usertype

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -120,36 +120,31 @@ public class workorder extends Controller {
             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 t2.depname like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("t1.phonenumber like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.name like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.accountno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("isleader") && !"".equals(whereObject.getString("isleader"))) {
-                where.append(" and t1.isleader ='").append(whereObject.getString("isleader")).append("' ");
+            if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
+                where.append(" and(");
+                where.append("t1.status ='").append(whereObject.getString("status")).append("' ");
+                where.append(")");
             }
+            if (whereObject.containsKey("usertype") && !"".equals(whereObject.getString("usertype"))) {
+                where.append(" and(");
+                where.append("t2.usertype ='").append(whereObject.getString("usertype")).append("' ");
+                where.append(")");
+            }
+        }
+        if(sys_enterpriseid>0){
+            where.append(" and(");
+            where.append("t4.sys_enterpriseid ='").append(sys_enterpriseid).append("' ");
+            where.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)));
-//	            }
-//	        }
-
-//	        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, "服务人员列表查询");
         sqlFactory.addParameter("siteid", siteid);
-//	        sqlFactory.addParameter_in("departmentid", departmentidsList);
         sqlFactory.addParameter_SQL("where", where);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_site_parameter",  "sys_site_parameterid");