Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/model/TBoxOperation.java

@@ -41,7 +41,7 @@ public class TBoxOperation implements Serializable {
     private String organId;
 
     @ApiModelProperty("mac地址")
-    @TableField("mac")
+    @TableField(value = "mac",updateStrategy = FieldStrategy.IGNORED)
     private String mac;
 
     @ApiModelProperty("状态 1.未激活 2.已激活 3.故障")

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -146,7 +146,7 @@ public class TBoxOperationController extends BaseController {
                 tBoxOperation.setPrivateKey(rsaKeys.get(1));
             }
             if (3==tBoxOperation.getStatus()) {
-                tBoxOperation.setMac("");
+                tBoxOperation.setMac(null);
                 TUser u = userService.getOne(new UpdateWrapper<TUser>().eq("org_id",tBoxOperation.getOrganId()).eq("type", 3).eq("is_deleted", false));
                 Set<String> keys = stringRedisTemplate.keys(SHIRO_JWT_TOKEN + "*");
                 ValueOperations<String, String> value = stringRedisTemplate.opsForValue();
@@ -201,7 +201,7 @@ public class TBoxOperationController extends BaseController {
         TUser user = getcurUser();
 
         try {
-            if (!user.getRoleList().contains("1")) {
+            if ("4".equals(user.getType())) {
                 //设置数据权限
                 String areaId = user.getAreaId();
                 tBoxOperationList = tBoxOperationService.getList(status, getAreaId(areaId));
@@ -240,8 +240,8 @@ public class TBoxOperationController extends BaseController {
            tBoxOperation.setAreaId(areaId);
         }
         if (StringUtils.isNotBlank(user.getAreaId())) {
-            if (!user.getRoleList().contains("1")) {
-                //设置数据权限
+            if ("4".equals(user.getType())) {
+                //如果是运维账号设置数据权限
                 tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
             }
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -291,7 +291,7 @@ public class TOrganController extends BaseController {
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @RequiresAuthentication  //@RequiresPermissions("/organ/import")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.IMPORT)
-    public ResponseEntity<Map> upload(MultipartFile file) {
+    public Map<String, Object> upload(MultipartFile file) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             boolean flag = false;
@@ -301,15 +301,15 @@ public class TOrganController extends BaseController {
             if (!flag) {
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "导入失败!");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "导入成功!");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             resultMap.put("resultCode", "500");
             resultMap.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+            return resultMap;
         }
     }