系统用户权限管理 新增判空

kmall-admin/src/main/java/com/kmall/admin/controller/SysUserBizPermissionController.java

@@ -3,12 +3,11 @@ package com.kmall.admin.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.SysUserBizPermissionEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.SysUserBizPermissionService;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
+import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,6 +63,15 @@ public class SysUserBizPermissionController {
     @RequiresPermissions("sysuserbizpermission:save")
     @ResponseBody
     public R save(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(sysUserBizPermission);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("userId", "用户");
+        builder.put("permissionId", "权限");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
+
         sysUserBizPermissionService.save(sysUserBizPermission);
 
         return R.ok();
@@ -76,6 +84,15 @@ public class SysUserBizPermissionController {
     @RequiresPermissions("sysuserbizpermission:update")
     @ResponseBody
     public R update(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(sysUserBizPermission);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("userId", "用户");
+        builder.put("permissionId", "权限");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
+
         sysUserBizPermissionService.update(sysUserBizPermission);
 
         return R.ok();

kmall-admin/src/main/resources/mybatis/mapper/SysBizPermissionDao.xml

@@ -35,7 +35,7 @@
 		from sys_biz_permission
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND permission_name LIKE concat('%',#{name},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -54,7 +54,7 @@
 		select count(*) from sys_biz_permission
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND permission_name LIKE concat('%',#{name},'%')
         </if>
 	</select>
 	 

kmall-admin/src/main/resources/mybatis/mapper/SysUserBizPermissionDao.xml

@@ -28,7 +28,7 @@
 		left join sys_biz_permission p2  on p.permission_id = p2.permission_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND userName LIKE concat('%',#{name},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -44,10 +44,11 @@
 	</select>
 	
  	<select id="queryTotal" resultType="int">
-		select count(*) from sys_user_biz_permission
+		select count(*) from sys_user_biz_permission p
+		left join sys_user u on p.user_id = u.user_id
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND u.username LIKE concat('%',#{name},'%')
         </if>
 	</select>