wuxw лет назад: 7
Родитель
Сommit
00aad4b05e

+ 1 - 1
OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java

@@ -194,7 +194,7 @@ public class PrivilegeSMOImpl implements IPrivilegeSMO {
         String pFlag = privilegeObj.getString("pFlag");//权限组
         privilegeObj.put("privilegeFlag","1".equals(pFlag)?"1":"0");
         List<Map> privilegeGroups = privilegeDAOImpl.queryUserPrivilege(privilegeObj);
-        Assert.isNotNull(privilegeGroups, "当前没有权限操作权限组" + privilegeInfo);
+        Assert.isNull(privilegeGroups, "已经存在该权限无需多次添加" + privilegeInfo);
 
         if (!privilegeDAOImpl.addUserPrivilege(privilegeObj)) {
             return new ResponseEntity<String>("添加权限失败", HttpStatus.INTERNAL_SERVER_ERROR);

+ 1 - 3
java110-common/src/main/java/com/java110/common/util/Assert.java

@@ -85,9 +85,7 @@ public class Assert extends org.springframework.util.Assert{
      */
     public static void isNull(JSONArray jsonArray,String message){
 
-        Assert.isNull(jsonArray,message);
-
-        if(jsonArray.size() < 1 ){
+        if(jsonArray != null && jsonArray.size() > 0 ){
             throw new IllegalArgumentException(message) ;
         }
     }