修改bug

VisualInspection/js/main.js

@@ -24,7 +24,7 @@ $(document).ready(function () {
 
         return;
     } else {
-        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + ",欢迎您"
+        var html = "<i class=\"icon icon-user\"></i>  " + user.truename + " " +user.organname+",欢迎您"
         $("#user").html(html);
     }
 

VisualInspection/js/mytask/check.js

@@ -39,7 +39,7 @@ function initCheck() {
     if ($.checkTask) {
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
-        console.log("ddddddddd"+$.checkTask);
+      
         $("#lane").val($.checkTask.checked_location);
         // setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {

VisualInspection/view/mytask/check.html

@@ -208,6 +208,7 @@
     $("#box").click(function () {
         return $("#_f").click();
     });
+    
     $("#_f").change(function () {
         UpladFile();
     });

VisualInspection/view/statistics/emp_ranking.html

@@ -4,7 +4,7 @@
     <div class="form-div">
         <form  class="form-horizontal">
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">选择查询范围:</label>
+                <label for="exampleInputAccount1" class="col-sm-1">查询范围:</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="fsList">
                     </select>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -25,6 +25,9 @@ public class User implements UserDetails {
 	private String password;
 	// 组织机构ID
 	private Integer organid;
+
+	// 组织机构ID
+	private String organname;
 	// 班次
 	private Integer classid;
 	

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -22,6 +22,7 @@ import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.RoleService;
 import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.util.CacheUtil;
 
 /**
  * 文件名：TestController
@@ -52,6 +53,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
     public String login(@RequestBody User user){
     	User u = authService.login(user.getUsername(), user.getPassword());
+    	u.setOrganname(CacheUtil.getOrgannameFromMap(new Long(u.getOrganid())));
     	u.setPassword(null);
         return returnSuccessResult("登陆成功", u);
     }