Added QIngkongshuju

js/basic.js

@@ -260,12 +260,12 @@ function send_alert(a, b){
 function getUserName(uid){
     var uname = null;
     Users.list.forEach(function(val, aid, arr){
-       if(val.worker.staffNo == uid){
+       if(val.worker.staffId === uid){
            uname = val.worker.staffName;
        }
     });
     if(uname == null) {
-        get_data("oaStaff/list?staffNo=" + uid, on_username_retn);
+        get_data("oaStaff/list?staffId=" + uid, on_username_retn);
         return "[用户:"+uid+"]";
     }else{
         return uname;
@@ -273,7 +273,7 @@ function getUserName(uid){
 }
 
 function on_username_retn(obj, sta) {
-    var uid = this.url.substring(this.url.indexOf("staffNo=") + 7);
+    var uid = this.url.substring(this.url.indexOf("staffId=") + 8);
     let ruid = parseInt(uid);
     var out = first_parse(this, obj);
     if(out.list.length > 0){

sign-in1.html

@@ -100,7 +100,7 @@
     function gotoLogin(){
         var password = $('input[name="password"]').val();
         var username = $('input[name="username"]').val();
-        get_data("/fcWorker/login?u=" + username +
+        get_data("/server/ajaxlogin?u=" + username +
                 "&p="+ password, onlogin_finish);
     }
 
@@ -111,7 +111,9 @@
 
         obj = first_parse(this, obj);
 
-        if(obj == undefined || obj == null || obj.list === undefined || obj.list == null || obj.list.length < 1){
+        if(obj == undefined || obj == null) {
+            send_alert("系统返回错误");
+        }else if (obj.msg !== undefined && obj.msg === "fail"){
             send_alert("用户名密码错误");
         }else{
             // TODO: 判断是否存在flowMaster，是否有权限