anderx 2 lat temu
rodzic
commit
c35052dabc

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ruoyi</groupId>
-    <artifactId>yfdk</artifactId>
+    <artifactId>kede-ry-yfdk</artifactId>
     <version>3.8.6</version>
 
     <name>kede-ry-yfdk</name>

+ 1 - 1
ruoyi-admin/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -44,9 +44,9 @@ spring:
 # 项目相关配置
 ruoyi:
   # 名称
-  name: RuoYi
+  name: kede-yfdk
   # 版本
-  version: 3.8.6
+  version: 1.0.0
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关

+ 1 - 1
ruoyi-common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 1 - 1
ruoyi-framework/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 1 - 1
ruoyi-generator/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 1 - 1
ruoyi-quartz/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 1 - 1
ruoyi-system/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yfdk</artifactId>
+        <artifactId>kede-ry-yfdk</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.8.6</version>
     </parent>

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -578,6 +578,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     @Override
     public Object selectName(String name,Integer type){
+        if (name==null||name.length()<2)return new ArrayList<>();
         Long roleId=null;
         if (type==null)type=0;
         if (type==0)roleId= UserRolesType.COMMON.getCode();
@@ -585,7 +586,6 @@ public class SysUserServiceImpl implements ISysUserService
         if (SecurityUtils.isSuperAdmin()){
             roleId=UserRolesType.ADMIN.getCode();;
         }
-        if (name==null||name.length()<2)return new ArrayList<>();
         Long companyId = deptService.selectCompanyByDeptId();
         return userMapper.selectName(name,roleId,companyId);
     }

+ 2 - 0
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectPostAll" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
+		order by post_sort
 	</select>
 
 	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user_post up on up.post_id = p.post_id
 	        left join sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
+		order by post_sort
 	</select>
 
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">

+ 5 - 4
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -306,11 +306,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_user a
 		where 1=1
 		and a.nick_name like concat('%',#{name},'%')
-		 <if test="roleId !=1">
+		<if test="roleId ==null">
 			and  a.user_id >1
-		 </if>
-		<if test="roleId!=null">
-		and a.user_id in (select user_id from sys_user_role where role_id = #{roleId})
+		</if>
+		<if test="roleId !=null and roleId !=1">
+			and  a.user_id >1
+			and a.user_id in (select user_id from sys_user_role where role_id = #{roleId})
 		</if>
 		<if test="companyId !=null and companyId != 0">
 			AND (a.dept_id = #{companyId} OR a.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{companyId}, ancestors) ))