班管家 2021-12-29:24

src/rest/openapi/base/restful/WebClientRest.java

@@ -841,7 +841,7 @@ public class WebClientRest {
         }else if(from_account.equals("2")){//鬼넋埼되쩌
             DBConnect connect = new DBConnect();
             Rows rows = connect.runSqlQuery("select t.fagentnum,t.workphone,t.siteid,t.role,t.password from worker t " +
-                    "where fisused=1 and workphone='" + username + "' and t.role='륩蛟莉낀'");
+                    "where fisused=1 and workphone='" + username + "' and t.role in ('륩蛟莉낀','駱澗莉낀')");
             if(!rows.isEmpty()){
                 String realpassword = rows.get(0).getString("password");
                 if(!realpassword.equals(password)){

src/rest/openapi/restcontroller/housekeeper/workorder/Serviceform.java

@@ -373,10 +373,9 @@ public class Serviceform extends Controller {
     /**服务单提醒**/
     public String remind(){
         DBConnect dbConnect=new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select t.fservernum from Serviceform t\n" +
+        Rows rows = dbConnect.runSqlQuery("select t.fservernum,t.customername,t.faddress from Serviceform t\n" +
                 "where t.siteid='"+siteid+"' and t.FAGENTNUM='"+fagentnum+"' and  EXISTS(select 1 from Workorder t1 where t1.servernum=t.fservernum and t1.ftype='施工' and fstatus='已完成')\n" +
                 "and not EXISTS(select 1 from Workorder t1 where t1.servernum=t.fservernum and t1.ftype='验收')");
-
         return getReturnObject_suc(rows,false).toString();
     }