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

@@ -72,6 +72,10 @@ public class TBoxOperation implements Serializable {
     @TableField(exist = false)
     private String organName;
 
+    @ApiModelProperty("机构名")
+    @TableField(exist = false)
+    private String organCode;
+
     @ApiModelProperty("区域名")
     @TableField(exist = false)
     private String areaName;

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

@@ -59,7 +59,9 @@ public class TBoardStatisticController extends BaseController {
         TUser user = null;
         try {
             user = getcurUser();
-            survey.setOrganCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                survey.setOrganCode(user.getOrgCode());
+            }
         } catch (Exception e) {
             survey.setOrganCode(null);
         }
@@ -79,7 +81,9 @@ public class TBoardStatisticController extends BaseController {
         TUser user = null;
         try {
             user = getcurUser();
-            rank.setOrganCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                rank.setOrganCode(user.getOrgCode());
+            }
         } catch (Exception e) {
             rank.setOrganCode(null);
         }
@@ -101,7 +105,9 @@ public class TBoardStatisticController extends BaseController {
         TUser user = null;
         try {
             user = getcurUser();
-            trend.setOrganCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                trend.setOrganCode(user.getOrgCode());
+            }
         } catch (Exception e) {
             trend.setOrganCode(null);
         }
@@ -138,7 +144,9 @@ public class TBoardStatisticController extends BaseController {
         TUser user = null;
         try {
             user = getcurUser();
-            district.setOrganCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                district.setOrganCode(user.getOrgCode());
+            }
         } catch (Exception e) {
             district.setOrganCode(null);
         }
@@ -159,10 +167,12 @@ public class TBoardStatisticController extends BaseController {
 //    @RequiresAuthentication  //@RequiresPermissions("t:board:statistic:provPlayList")
     @ApiOperation(value = "获取省级展板播放统计", notes = "获取省级展板播放统计")
     public Map<String, Object> getBoardProvincePlayTotalList(String organId) {
-        String orgCode;
+        String orgCode = null;
         try {
             TUser user = getcurUser();
-            orgCode = user.getOrgCode();
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                orgCode = user.getOrgCode();
+            }
         } catch (Exception e) {
             orgCode = null;
         }
@@ -179,10 +189,12 @@ public class TBoardStatisticController extends BaseController {
 //    @RequiresAuthentication  //@RequiresPermissions("t:board:statistic:districtPage")
     @ApiOperation(value = "获取互动频次统计信息", notes = "获取互动频次统计信息")
     public Map<String, Object> getInteractionFrequencyPageList(String frequencyDate) {
-        String orgCode;
+        String orgCode = null;
         try {
             TUser user = getcurUser();
-            orgCode = user.getOrgCode();
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                orgCode = user.getOrgCode();
+            }
         } catch (Exception e) {
             orgCode = null;
         }
@@ -224,7 +236,9 @@ public class TBoardStatisticController extends BaseController {
         TUser user = null;
         try {
             user = getcurUser();
-            trend.setOrganCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                trend.setOrganCode(user.getOrgCode());
+            }
         } catch (Exception e) {
             trend.setOrganCode(null);
         }
@@ -261,10 +275,12 @@ public class TBoardStatisticController extends BaseController {
     @ApiOperation(value = "获取互动频次统计信息pc", notes = "获取互动频次统计信息pc")
 //    @MethodLog(operModule = OperModule.INTERACTION, operType = OperType.SELECT)
     public Map<String, Object> getInteractionPageList(String frequencyDate) {
-        String orgCode;
+        String orgCode = null;
         try {
             TUser user = getcurUser();
-            orgCode = user.getOrgCode();
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                orgCode = user.getOrgCode();
+            }
         } catch (Exception e) {
             orgCode = null;
         }

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

@@ -245,6 +245,10 @@ public class TBoxOperationController extends BaseController {
                 tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
             }
         }
+        if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+            //设置用户数据权限
+            tBoxOperation.setOrganCode(user.getOrgCode());
+        }
         Page<TBoxOperation> page = null;
         try {
             page = this.tBoxOperationService.selectPage(getPage(), tBoxOperation);

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

@@ -184,8 +184,10 @@ public class TOrganController extends BaseController {
         try {
             user = getcurUser();
             TOrgan tOrgan = new TOrgan();
-            //设置用户数据权限
-            tOrgan.setCode(user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                //设置用户数据权限
+                tOrgan.setCode(user.getOrgCode());
+            }
             List<TOrgan> list = tOrganService.getAllList(tOrgan);
             return getResult(list);
         } catch (Exception e) {
@@ -221,8 +223,10 @@ public class TOrganController extends BaseController {
                 queryWrapper.ge(TOrgan::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
                         .le(TOrgan::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
             }
-            //设置用户数据权限
-            queryWrapper.likeRight(TOrgan::getCode, user.getOrgCode());
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                //设置用户数据权限
+                queryWrapper.likeRight(TOrgan::getCode, user.getOrgCode());
+            }
             queryWrapper.eq(TOrgan::getIsDeleted, false);
             // 设置排序规则
             queryWrapper.orderByDesc(TOrgan::getCreateTime);
@@ -257,11 +261,19 @@ public class TOrganController extends BaseController {
     public Map<String, Object> getTree(String name) {
         TUser user = getcurUser();
         List<TOrgan> list = new ArrayList<>();
+        UpdateWrapper<TOrgan> wrapper = new UpdateWrapper<>();
         try {
+            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+                //设置用户数据权限
+                wrapper.likeRight("code", user.getOrgCode());
+            }else {
+                user.setOrgCode("");
+            }
             if (StringUtils.isBlank(name)) {
                 list = tOrganService.getTree(user.getOrgCode());
             } else {
-                list = tOrganService.list(new UpdateWrapper<TOrgan>().like("name", name).likeRight("code", user.getOrgCode()));
+                wrapper.like("name", name);
+                list = tOrganService.list(wrapper);
             }
             return getResult(list);
         } catch (Exception e) {

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

@@ -89,14 +89,10 @@ public class TUserController extends BaseController {
         }
         if (StringUtils.isNotBlank(type)) {
             user.setType(type);
-            if (!"4".equals(type)) {
+            if (user1.getRoleList().size()>0&&!user1.getRoleList().contains("1")) {
                 //设置用户数据权限
                 user.setOrgCode(user1.getOrgCode());
             }
-            if ("4".equals(type)) {
-                //设置用户数据权限
-                user.setAreaName(TBoxOperationController.getAreaId(user1.getAreaId()));
-            }
             if ("2".equals(type)) {
                 List<String> roleList = user1.getRoleList();
                 //如果是单位用户，只能查看本机构的单位用户
@@ -138,7 +134,7 @@ public class TUserController extends BaseController {
         try {
             if (StringUtils.isNotBlank(type)) {
                 user.setType(type);
-                if (!"4".equals(type) && !"5".equals(type)) {
+                if (user1.getRoleList().size()>0&&!user1.getRoleList().contains("1")) {
                     //设置用户数据权限
                     user.setOrgCode(user1.getOrgCode());
                 }

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -80,6 +80,9 @@
         <if test="tBoxOperation.areaName != null and tBoxOperation.areaName != '' ">
             and b.area_id LIKE concat(#{tBoxOperation.areaName}, '%')
         </if>
+        <if test="tBoxOperation.orgCode != null and tBoxOperation.orgCode != '' ">
+            and r.code LIKE concat(#{tBoxOperation.orgCode}, '%')
+        </if>
         order by b.create_time desc
     </select>