查看全部

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -391,6 +391,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerThisOrg")){
                     sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
                 }
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrgAll")){
+                    sql.append("and 1=1 ");
+                }
             }
             sql.append(" ORDER BY sms_check_customer_info_become_due.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
             return sql.toString();

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -50,7 +50,8 @@ public class SysPermissionController {
 	private static String powerCreateBy="sysPowerCreateBy";
 	//只看本部门
 	private static String powerThisOrg="sysPowerThisOrg";
-
+	//查看全部数据
+	private static String powerOrgAll="sysPowerOrgAll";
 	@Autowired
 	private ISysPermissionService sysPermissionService;
 
@@ -510,6 +511,7 @@ public class SysPermissionController {
 			String sysPermission1 = sysPermissionService.queryListByPermissionName(powerCreateBy).get(0).getId();
 			String sysPermission2 = sysPermissionService.queryListByPermissionName(powerOrg).get(0).getId();
 			String sysPermission3 = sysPermissionService.queryListByPermissionName(powerThisOrg).get(0).getId();
+			String sysPermission4 = sysPermissionService.queryListByPermissionName(powerOrgAll).get(0).getId();
 			sysPermissionService.queryListByPermissionName(powerCreateBy);
 			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("1")){
 				join = sysPermission1;
@@ -520,6 +522,9 @@ public class SysPermissionController {
 			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("3")){
 				join = sysPermission3;
 			}
+			if (StringUtils.isNotBlank(byId.getPower())&&byId.getPower().equals("4")){
+				join = sysPermission4;
+			}
 			if (StringUtils.isNotBlank(join)){
 				//查出原有的
 				LambdaQueryWrapper<SysRolePermission> query = new LambdaQueryWrapper<SysRolePermission>();

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -80,6 +80,8 @@ public class SysRoleController {
 	private static String powerCreateBy="sysPowerCreateBy";
 	//只看本部门
 	private static String powerThisOrg="sysPowerThisOrg";
+	//查看全部数据
+	private static String powerOrgAll="sysPowerOrgAll";
 	/**
 	  * 分页列表查询
 	 * @param role
@@ -160,6 +162,7 @@ public class SysRoleController {
 			String sysPermission1 = sysPermissionService.queryListByPermissionName(powerCreateBy).get(0).getId();
 			String sysPermission2 = sysPermissionService.queryListByPermissionName(powerOrg).get(0).getId();
 			String sysPermission3 = sysPermissionService.queryListByPermissionName(powerThisOrg).get(0).getId();
+			String sysPermission4 = sysPermissionService.queryListByPermissionName(powerOrgAll).get(0).getId();
 			sysPermissionService.queryListByPermissionName(powerCreateBy);
 			if (StringUtils.isNotBlank(role.getPower())&&role.getPower().equals("1")){
  				join = sysPermission1;
@@ -170,6 +173,9 @@ public class SysRoleController {
 			if (StringUtils.isNotBlank(role.getPower())&&role.getPower().equals("3")){
 				join = sysPermission3;
 			}
+			if (StringUtils.isNotBlank(role.getPower())&&role.getPower().equals("4")){
+				join = sysPermission4;
+			}
 			if (StringUtils.isNotBlank(join)){
 				//查出原有的
 				LambdaQueryWrapper<SysRolePermission> query = new LambdaQueryWrapper<SysRolePermission>();