bug修复

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

@@ -82,7 +82,7 @@ public class hr extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_hr", "t1.*").setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_department", "t2", "t1.siteid = t2.siteid and t1.departmentid = t2.departmentid",
                 "depname","depfullname");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t3", "t1.userid = t3.userid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t3", "t1.userid = t3.userid","accountno");
         querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t4", "t1.siteid = t4.siteid and t1.reporthrid = t4.hrid");
 
         querySQL.addQueryFields("reporthrname","t4.name");
@@ -328,25 +328,16 @@ public class hr extends Controller {
         }
         str.append(")");
         ArrayList<String> sqlList = new ArrayList<>();
-        Rows rows = dbConnect.runSqlQuery("select hrid,name from sys_hr where siteid='" + siteid + "' and hrid in" + str);
+        Rows rows = dbConnect.runSqlQuery("select hrid,name,userid from sys_hr where siteid='" + siteid + "' and hrid in" + str);
         String msg = "";
         for (Row row : rows) {
             long hrid = row.getLong("hrid");
+            long tempuserid = row.getLong("userid");
             boolean toisleave = false;
-            if (dbConnect.runSqlQuery("select 1 from sat_submitedit where siteid='" + siteid + "' and hrid=" + hrid).isNotEmpty()) {
-                toisleave = true;
-            } else if (dbConnect.runSqlQuery("select 1 from sa_salestargetbill t1 inner join sa_salestarget t2 on t1.siteid=t2.siteid and t1.sa_salestargetbillid=t2.sa_salestargetbillid where t1.siteid='" + siteid + "' and t2.hrid=" + hrid).isNotEmpty()) {
+            if (dbConnect.runSqlQuery("select 1 from sa_salestargetbill t1 inner join sa_salestarget t2 on t1.siteid=t2.siteid and t1.sa_salestargetbillid=t2.sa_salestargetbillid where t1.siteid='" + siteid + "' and t1.createuserid=" + tempuserid).isNotEmpty()) {
                 toisleave = true;
             } else if (dbConnect.runSqlQuery("select 1 from sa_order where deleted=0 and siteid='" + siteid + "' and saler_hrid=" + hrid).isNotEmpty()) {
                 toisleave = true;
-            } else if (dbConnect.runSqlQuery("select 1 from sa_serviceorder where siteid='" + siteid + "' and saler_hrid=" + hrid).isNotEmpty()) {
-                toisleave = true;
-            } else if (dbConnect.runSqlQuery("select 1 from sys_workreport where siteid='" + siteid + "' and hrid=" + hrid).isNotEmpty()) {
-                toisleave = true;
-            } else if (dbConnect.runSqlQuery("select 1 from sa_hrcashbill where siteid='" + siteid + "' and hrid=" + hrid).isNotEmpty()) {
-                toisleave = true;
-            } else if (dbConnect.runSqlQuery("select balance qty from sa_hraccountbalance where siteid='" + siteid + "' and hrid=" + hrid).sum("balance").compareTo(BigDecimal.ZERO) > 0) {
-                toisleave = true;
             }
             if (toisleave) {
                 sqlList.add("update sys_hr set status=1 where siteid='" + siteid + "' and hrid=" + hrid);