Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java

@@ -16,10 +16,13 @@ public class LogDTO implements Serializable {
     /**内容*/
     private String logContent;
 
-    /**日志类型(0:操作日志;1:登录日志;2:定时任务)  */
+    /**	 日志类型（1登录日志，2操作日志）  */
     private Integer logType;
 
-    /**操作类型(1:添加;2:修改;3:删除;) */
+
+    /**
+     *  操作类型（1查询，2添加，3修改，4删除,5导入，6导出）
+      */
     private Integer operateType;
 
     /**登录用户 */

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java

@@ -84,7 +84,8 @@ public class YouBianCodeUtil {
 			return getNextYouBianCode(localCode);
 
 		}else{
-			parentCode = parentCode + "A"+ getNextStrNum(0);
+			int num = Integer.parseInt(localCode.substring(localCode.length()-2,localCode.length()));
+			parentCode = parentCode + "A"+ getNextStrNum(num);
 		}
 		return parentCode;
 	}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java

@@ -16,6 +16,7 @@ import com.jero.common.util.YouBianCodeUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.mapper.SysDepartMapper;
 import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserDepartService;
@@ -62,6 +63,9 @@ public class SysDepartController {
 	private ISysUserService sysUserService;
 	@Autowired
 	private ISysUserDepartService sysUserDepartService;
+
+	@Autowired
+	private SysDepartMapper sysDepartMapper;
 	/**
 	 * 查询数据 查出我的部门,并以树结构数据格式响应给前端
 	 *
@@ -171,6 +175,10 @@ public class SysDepartController {
 	public Results<Object> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
 		String username = JwtUtil.getUserNameByToken(request);
 		try {
+			long count =  sysDepartMapper.selectCountByPId(sysDepart);
+			if(count > 0){
+				return Results.error("同级目录下，名称不能重复");
+			}
 			sysDepart.setCreateBy(username);
 			sysDepartService.saveDepartData(sysDepart, username);
 			return Results.OK("操作成功!");
@@ -191,6 +199,10 @@ public class SysDepartController {
 	@PostMapping("/edit")
 	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
 	public Results<Object> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
+		long count =  sysDepartMapper.selectCountByPId(sysDepart);
+		if(count > 0){
+			return Results.error("同级目录下，名称不能重复");
+		}
 		String username = JwtUtil.getUserNameByToken(request);
 		sysDepart.setUpdateBy(username);
 		SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId());

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -167,6 +167,8 @@ public class SysUserController {
     @PostMapping("/add")
 	public Results<Object> add(@RequestBody JSONObject jsonObject) {
         try {
+            //开始时间
+            long startTime = System.currentTimeMillis();
             String selectedRoles = jsonObject.getString(SELECTED_ROLES);
             String selectedDeparts = jsonObject.getString("selecteddeparts");
             String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
@@ -176,7 +178,13 @@ public class SysUserController {
             this.setUserInfo(rsaPrivateKey, user);
 
             // 保存用户走一个service 保证事务
+            String id = UUID.randomUUID().toString().replace("-", "");
+            user.setId(id);
             sysUserService.saveUser(user, selectedRoles, selectedDeparts);
+            long endTime = System.currentTimeMillis();
+            long costTime = endTime - startTime;
+            baseCommonService.addLog("新增用户，id： " +id ,CommonConstant.LOG_TYPE_2, 2,null,
+                    costTime);
             return Results.OK(OPTION_SUCCESS);
 		} catch (Exception e) {
 			SysUserController.log.error(e.getMessage(), e);
@@ -235,7 +243,7 @@ public class SysUserController {
                 //结束时间
                 long endTime = System.currentTimeMillis();
                 long costTime = endTime - startTime;
-                baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2,null,
+                baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null,
                         costTime);
                 return Results.OK(OPTION_SUCCESS);
 			}
@@ -281,7 +289,7 @@ public class SysUserController {
 		this.sysUserService.deleteUser(id);
         long endTime = System.currentTimeMillis();
         long costTime = endTime - startTime;
-        baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3,null,costTime);
+        baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
 		return Results.OK("删除用户成功");
 	}
 
@@ -297,7 +305,7 @@ public class SysUserController {
 
         long endTime = System.currentTimeMillis();
         long costTime = endTime - startTime;
-        baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3,null,costTime);
+        baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
 		return Results.OK("批量删除用户成功");
 	}
 
@@ -778,12 +786,13 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRole")
     @RequiresPermissions("sys:user:sel")
-    public Results<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
+    public Results<Object> deleteUserRole(@RequestBody SysUserRole sysUserRole) {
-                                          @RequestParam(name="userId",required=true) String userId) {
+        try {
-          try {
+           String userId = sysUserRole.getUserId();
-            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+           String roleId = sysUserRole.getRoleId();
-            queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
+           QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
-            sysUserRoleService.remove(queryWrapper);
+           queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
+           sysUserRoleService.remove(queryWrapper);
               return Results.OK(DEL_SUCCESS);
         }catch(Exception e) {
             SysUserController.log.error(e.getMessage(), e);
@@ -799,10 +808,10 @@ public class SysUserController {
      */
     @PostMapping("/deleteUserRoleBatch")
     @RequiresPermissions("sys:user:sel")
-    public Results<SysUserRole> deleteUserRoleBatch(
+    public Results<SysUserRole> deleteUserRoleBatch(@RequestBody SysUserRole sysUserRole) {
-            @RequestParam(name="roleId") String roleId,
-            @RequestParam(name="userIds",required=true) String userIds) {
         try {
+            String roleId = sysUserRole.getRoleId();
+            String userIds = sysUserRole.getUserIds();
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(",")));
             sysUserRoleService.remove(queryWrapper);
@@ -1239,7 +1248,8 @@ public class SysUserController {
      */
     @PostMapping("/deleteRecycleBin")
     @RequiresPermissions("sys:user:sel")
-    public Results<T> deleteRecycleBin(@RequestParam("userIds") String userIds) {
+    public Results<T> deleteRecycleBin(@RequestBody SysUser sysUser) {
+        String userIds = sysUser.getUserIds();
         if (StringUtils.isNotBlank(userIds)) {
             sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
         }
@@ -1281,7 +1291,8 @@ public class SysUserController {
             }
             long endTime = System.currentTimeMillis();
             long costTime = endTime - startTime;
-            baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2,null,costTime);
+            baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null,
+                    costTime);
         } catch (Exception e) {
             SysUserController.log.error(e.getMessage(), e);
             return Results.error("操作失败!");
@@ -1475,7 +1486,7 @@ public class SysUserController {
                     sysUserService.addRoleToUser(user, roles);
                     endTime = System.currentTimeMillis();
                     costTime = endTime - startTime;
-                    baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 2,null,costTime);
+                    baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 3,null,costTime);
                 }
             }
         } catch (Exception e) {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java

@@ -1,6 +1,7 @@
 package com.jero.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -175,4 +176,7 @@ public class SysUser implements Serializable {
     /**设备id uniapp推送用*/
     private String clientId;
 
+    @TableField(exist = false)
+    private String userIds;
+
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUserRole.java

@@ -1,14 +1,14 @@
 package com.jero.modules.system.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户角色表
@@ -37,6 +37,9 @@ public class SysUserRole implements Serializable {
      */
     private String roleId;
 
+    @TableField(exist = false)
+    private String userIds;
+
 	public SysUserRole() {
 	}
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java

@@ -71,4 +71,7 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	 */
 	@Select("SELECT * FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
 	List<SysDepart> queryDeptByPid(@Param("parentId")String parentId);
+
+
+	long selectCountByPId(@org.apache.ibatis.annotations.Param("pageVO") SysDepart sysDepart);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml

@@ -52,4 +52,24 @@
     <select id="queryCompByOrgCode" resultType="com.jero.modules.system.entity.SysDepart">
         select * from sys_depart where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR}
     </select>
+
+    <select id="selectCountByPId" resultType="java.lang.Long">
+        select count(1) from   sys_depart
+
+        <where>
+            del_flag = '0'
+            <if test="pageVO.id != null and pageVO.id != ''">
+                and id != #{pageVO.id}
+            </if>
+            <if test="pageVO.parentId != null and pageVO.parentId != ''">
+                and parent_id = #{pageVO.parentId}
+            </if>
+
+            <if test="pageVO.departName != null and pageVO.departName != ''">
+                and depart_name = #{pageVO.departName}
+            </if>
+        </where>
+
+
+    </select>
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java

@@ -1,33 +1,37 @@
 package com.jero.modules.system.service.impl;
 
-import java.util.*;
-
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jero.common.system.vo.SysDepartTreeModel;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.util.oConvertUtils;
-import org.apache.commons.lang.StringUtils;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
+import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.common.util.YouBianCodeUtil;
-import com.jero.modules.system.entity.*;
+import com.jero.common.util.oConvertUtils;
-import com.jero.modules.system.mapper.*;
+import com.jero.modules.system.entity.SysDepart;
+import com.jero.modules.system.entity.SysDepartPermission;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.entity.SysUserDepart;
+import com.jero.modules.system.mapper.SysDepartMapper;
+import com.jero.modules.system.mapper.SysDepartPermissionMapper;
+import com.jero.modules.system.mapper.SysUserDepartMapper;
+import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.util.FindsDepartsChildrenUtil;
+import io.netty.util.internal.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import io.netty.util.internal.StringUtil;
 
 /**
  * <p>