Browse Source

7.23修改同步

sunjiabei/feature-20250710132313-二期模块
huangqizhen 4 weeks ago
parent
commit
f455296760
  1. 3
      src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
  2. 6
      src/main/resources/application-dev.yml
  3. 2
      src/main/resources/mapper/PermissionMapper.xml

3
src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java

@ -131,6 +131,9 @@ public class GeneralServiceImpl implements GeneralService {
List<String> list = Arrays.asList(market.split(",")); List<String> list = Arrays.asList(market.split(","));
//判断是否是总部 //判断是否是总部
if (list != null && list.contains("总部")) { if (list != null && list.contains("总部")) {
List<String> allMarkets = getMarket(); // 获取所有地区 List<String> allMarkets = getMarket(); // 获取所有地区
allMarkets.add(0, "总部"); // 总部添加到列表第一位 allMarkets.add(0, "总部"); // 总部添加到列表第一位
list = allMarkets; // 更新list list = allMarkets; // 更新list

6
src/main/resources/application-dev.yml

@ -35,9 +35,9 @@ spring:
data: data:
redis: redis:
database: 0 database: 0
host: 18.143.76.3
port: 10703
password: Ngc0FYUTA6h3wC5J
host: localhost
port: 6379
password: 123456
lettuce: lettuce:
pool: pool:

2
src/main/resources/mapper/PermissionMapper.xml

@ -92,7 +92,7 @@
) )
</if> </if>
</where> </where>
order by admin.admin_status desc
order by admin.admin_status desc ,admin.update_time desc
</select> </select>
<select id="getRole" resultType="com.example.demo.domain.entity.Role"> <select id="getRole" resultType="com.example.demo.domain.entity.Role">
select * select *

Loading…
Cancel
Save