修改用户菜单接口增加用户判断类型

user_center/src/main/java/com/huaxu/controller/MenuController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.common.FileUploadUtil;
 import com.huaxu.entity.UserEntity;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -61,6 +63,14 @@ public class MenuController {
     @ApiOperation(value = "新增菜单信息")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public AjaxMessage<Integer> addMenu(@ApiParam(value = "菜单信息", required = true) @RequestBody MenuEntity menu) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            menu.setUpdateBy(currentUser.getUsername());
+            menu.setCreateBy(currentUser.getUsername());
+            menu.setDateCreate(new Date());
+            menu.setDateUpdate(new Date());
+        }
+        menu.setStatus(1);
         int result = menuService.addMenu(menu) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
@@ -109,6 +119,11 @@ public class MenuController {
     @ApiOperation(value = "修改保存菜单")
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     public AjaxMessage<Integer> editMenu(@ApiParam(value = "菜单信息", required = true) @RequestBody MenuEntity menu) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            menu.setUpdateBy(currentUser.getUsername());
+            menu.setDateUpdate(new Date());
+        }
         int result = menuService.updateMenuById(menu) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -6,9 +6,11 @@ import com.huaxu.common.FileUploadUtil;
 import com.huaxu.entity.App;
 import com.huaxu.entity.UserTagEntity;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.UserTagService;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -102,6 +104,14 @@ public class UserController {
                 return new AjaxMessage<>(ResultStatus.MEMBER_TELPHONE_ALREADY_EXISTS, 0);
             }
         }
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            user.setUpdateBy(currentUser.getUsername());
+            user.setCreateBy(currentUser.getUsername());
+            user.setDateCreate(new Date());
+            user.setDateUpdate(new Date());
+        }
+        user.setStatus(1);
         int result = userService.addUser(user) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
@@ -119,6 +129,11 @@ public class UserController {
                 return new AjaxMessage<>(ResultStatus.MEMBER_TELPHONE_ALREADY_EXISTS, 0);
             }
         }
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            user.setUpdateBy(currentUser.getUsername());
+            user.setDateUpdate(new Date());
+        }
         int result = userService.updateUserById(user) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

user_center/src/main/java/com/huaxu/entity/UserRoleEntity.java

@@ -1,9 +1,7 @@
 package com.huaxu.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -35,6 +33,7 @@ public class UserRoleEntity implements Serializable {
     private Long roleId;
 
     /** 数据删除标记 */
+    @TableLogic
     private Integer status;
 
     /** 创建时间 */
@@ -52,4 +51,7 @@ public class UserRoleEntity implements Serializable {
     /** 创建者 */
     @ApiModelProperty(value = "创建者")
     private String createBy;
+    @ApiModelProperty(value = "角色名称")
+    @TableField(exist = false)
+    private String roleName;
 }

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -4,6 +4,8 @@ package com.huaxu.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.MenuMapper;
 import com.huaxu.entity.MenuEntity;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -7,6 +7,8 @@ import com.huaxu.dao.UserMapper;
 import com.huaxu.entity.UserEntity;
 import com.huaxu.entity.UserRoleEntity;
 import com.huaxu.entity.UserTagEntity;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,6 +39,8 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 	 * 自定义分页查询，含关联实体对像
 	 */
 	public IPage<UserEntity> findPage(IPage<UserEntity> page, UserEntity userEntity) {
+		LoginUser currentUser = UserUtil.getCurrentUser();
+		userEntity.setTenantId(currentUser.getTenantId());
 		Page<UserEntity> userPage = userMapper.findPage(page, userEntity);
 		return userPage;
 	}
@@ -45,6 +49,8 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 	 * 查列表
 	 */
 	public List<UserEntity> findList(UserEntity userEntity) {
+		LoginUser currentUser = UserUtil.getCurrentUser();
+		userEntity.setTenantId(currentUser.getTenantId());
 		return userMapper.findList(userEntity);
 	}
 

user_center/src/main/resources/mapper/UserMapper.xml

@@ -42,13 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          a.update_by as "updateBy",
          com.org_name as "companyOrgName" ,
          dep.org_name as "deptOrgName",
-         userrole.id as roleId
+         userrole.id as roleId,
+         role.role_name as "roleName"
      </sql>
     <!-- 外联表  -->
      <sql id="sysAreaJoins">
           left join uims_org com ON com.id = a.company_org_id
           left join uims_org dep ON dep.id = a.dept_org_id
-          left join uims_user_role userrole ON userrole.USER_ID=a.id
+          left join uims_user_role userrole ON userrole.USER_ID=a.id and  userrole.status=1
+          left join uims_role role on role.id=userrole.ROLE_ID
      </sql>
 
     <!--  根据主键获取实体   -->
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      and a.phone like concat('%', #{phone},'%')
              </if>
 		</where>
+		order by a.date_create desc
 	 </select>
 	  <!--  根据获取实体 page   -->
      <select id="findPage" resultType="com.huaxu.entity.UserEntity">
@@ -93,5 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  and a.DEPT_ORG_ID = #{user.deptOrgId}
             </if>
 		</where>
+        order by a.date_create desc
 	 </select>
 </mapper>

user_center/src/main/resources/mapper/UserRoleMapper.xml

@@ -35,7 +35,7 @@
         <include refid="userRoleColumns"/>
         FROM uims_user_role a
 
-        WHERE a.id = #{id}
+        WHERE a.id = #{id} and  a.status=1
     </select>
 
     <!--  根据获取实体List   -->
@@ -45,6 +45,7 @@
         FROM uims_user_role a
 
         <where>
+            a.status=1
             <if test="userId != null ">and a.user_id = #{userId}</if>
             <if test="roleId != null ">and a.role_id = #{roleId}</if>
             <if test="status != null ">and a.status = #{status}</if>
@@ -61,6 +62,7 @@
         FROM uims_user_role a
 
         <where>
+            a.status=1
             <if test="userRole.userId != null ">and a.user_id = #{userRole.userId}</if>
             <if test="userRole.roleId != null ">and a.role_id = #{userRole.roleId}</if>
             <if test="userRole.status != null ">and a.status = #{userRole.status}</if>

user_center/src/main/resources/mapper/UserTagMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           SELECT 
 			<include refid="userTagColumns"/>
 		FROM  uims_user_tag a
-		WHERE a.id = #{id}
+		WHERE a.id = #{id} and a.status=1
     </select>
      <!--  根据获取实体List   -->
      <select id="findList" resultType="com.huaxu.entity.UserTagEntity">
@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<include refid="userTagColumns"/>
 		FROM uims_user_tag a
 		<where>
+              a.status=1
               <if test="userId != null "> and a.user_id = #{userId} </if>
               <if test="tagId != null "> and a.tag_id = #{tagId} </if>
               <if test="status != null "> and a.status = #{status} </if>
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<include refid="userTagColumns"/>
 		FROM uims_user_tag a
 		<where>
+               a.status=1
                <if test="userTag.userId != null "> and a.user_id = #{userTag.userId} </if>
                <if test="userTag.tagId != null "> and a.tag_id = #{userTag.tagId} </if>
                <if test="userTag.status != null "> and a.status = #{userTag.status} </if>