Merge branch 'developer' into 'master'

Developer

See merge request !69

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/DataAuthApiServiceImpl.java

@@ -6,6 +6,7 @@ import com.gic.cloud.dto.DataAuthDTO;
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysDataAuth;
 import com.gic.cloud.entity.TabSysUser;
+import com.gic.cloud.qo.UserQo;
 import com.gic.cloud.service.DataAuthApiService;
 import com.gic.cloud.service.DataAuthService;
 import com.gic.cloud.service.UserService;
@@ -66,6 +67,14 @@ public class DataAuthApiServiceImpl implements DataAuthApiService{
 
     @Override
     public ServiceResponse<Void> deleteDataAuth(Integer dataAuthId) {
+        TabSysDataAuth record = dataAuthService.getDataAuth(dataAuthId);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有该数据权限");
+        }
+        com.github.pagehelper.Page<TabSysUser> pageUser = userService.pageUser(new UserQo().setEnterpriseId(record.getEnterpriseId()).setDataAuthId(dataAuthId));
+        if (pageUser != null && CollectionUtils.isNotEmpty(pageUser.getResult())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户使用中，不能删除");
+        }
         dataAuthService.deleteDataAuth(dataAuthId);
         return ServiceResponse.success();
     }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/FunctionApiServiceImpl.java

@@ -9,6 +9,7 @@ import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysFunction;
 import com.gic.cloud.entity.TabSysFunctionModule;
 import com.gic.cloud.entity.TabSysUser;
+import com.gic.cloud.qo.UserQo;
 import com.gic.cloud.service.FunctionApiService;
 import com.gic.cloud.service.FunctionModuleService;
 import com.gic.cloud.service.FunctionService;
@@ -62,6 +63,14 @@ public class FunctionApiServiceImpl implements FunctionApiService{
 
     @Override
     public ServiceResponse<Void> deleteFunction(Integer functionId) {
+        TabSysFunction record = functionService.getFunction(functionId);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有该功能权限");
+        }
+        com.github.pagehelper.Page<TabSysUser> pageUser = userService.pageUser(new UserQo().setEnterpriseId(record.getEnterpriseId()).setFunctionAuthId(functionId));
+        if (pageUser != null && CollectionUtils.isNotEmpty(pageUser.getResult())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户使用中，不能删除");
+        }
         functionService.deleteFunction(functionId);
         return ServiceResponse.success();
     }