2021年12月18日10:02:29

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

@@ -26,6 +26,9 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
+
+import static org.junit.Assert.assertNotNull;
+
 import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -335,11 +338,26 @@ public class WebClientRest {
 
             mobject.put(moduleid, rows_appid.toJsonArray("appid"));
         }
-
+        
         JSONObject object = new JSONObject();
         object.put("status", "ok");
         object.put("token", token);
         JSONObject dataobject = new JSONObject();
+        if(fusertype.equals("服务人员")) {
+        	Rows rows_worker=connect.runSqlQuery(
+                    "select role from hyworker where fisused=1 and hyworkernum='"
+                            + username +"'");
+        	if(!rows_worker.isEmpty()) {
+        		if( rows_worker.get(0).getString("role")!=null && rows_worker.get(0).getString("role").length()>0 && rows_worker.get(0).getString("role").equals("服务主管")) {
+        			 dataobject.put("fusertype_role", rows_worker.get(0).getString("role"));
+        		}else {
+        			 dataobject.put("fusertype_role", "服务人员");
+				}
+        		
+        	}else {
+        		 dataobject.put("fusertype_role", "服务人员");
+			}
+        }
         dataobject.put("fusertype", fusertype);
         dataobject.put("fisservice", fisservice);
         dataobject.put("fagentnum", fagentnum);