From 36f0e2560acb75f323ba4ccd8e5cc1631843e5b8 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Thu, 20 Jun 2024 15:31:22 +0800
Subject: [PATCH] bugfix

---
 .../jjh/declaration/single/controller/ChiefController.java    | 2 +-
 .../single/service/impl/SingleLoginServiceImpl.java           | 3 ++-
 ruoyi-admin/src/main/resources/application.yml                | 2 +-
 .../java/com/ruoyi/framework/config/MyMetaObjectHandler.java  | 4 ++--
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java
index 8275c8c..613e896 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java
@@ -91,7 +91,7 @@ public class ChiefController {
                     JSONObject dataJson = JSONUtil.parseObj(getMain.body());
                     ChiefResponse bean = JSONUtil.toBean(dataJson, ChiefResponse.class);
                     //判断几个政务端用户,等待商量结果
-                    //lj 102 其他是100
+                    //lj 102 其他是100 //要给dept部门id
                     bean.setToken(singleLoginService.singleLogin(bean.getId(),bean.getName(),null,"02",bean.getMobile()));
                     return AjaxResult.success(bean);
                 } else {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java
index 14b2abb..f045826 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java
@@ -52,8 +52,9 @@ public class SingleLoginServiceImpl implements SingleLoginService {
             if("01".equals(userType)){
                 roles[0]=101L;
             }else if("02".equals(userType)){
-                //在这里可以判断具体要给什么权限
+                //在这里可以判断具体要给什么权限  要给dept部门id
                 roles[0]=102L;
+                user.setDeptId(100L);
             }
             user.setRoleIds(roles);
             user.setStatus("0");
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f1fcb5d..1376adf 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -52,7 +52,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: internet
+    active: druid
   # 文件上传
   servlet:
     multipart:
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java
index 075c02d..3584a7c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java
@@ -27,7 +27,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         Long userId = null;
         try {
             LoginUser loginUser = SecurityUtils.getLoginUser();
-            userName = loginUser.getUsername();
+            userName = loginUser.getUser().getNickName();
             userId = SecurityUtils.getUserId();
         } catch (Exception ignored) {
         }
@@ -47,7 +47,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         Long userId = null;
         try {
             LoginUser loginUser = SecurityUtils.getLoginUser();
-            userName = loginUser.getUsername();
+            userName = loginUser.getUser().getNickName();
             userId = SecurityUtils.getUserId();
         } catch (Exception ignored) {
         }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2d9faa1..4ec71a1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -199,12 +199,12 @@
         <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="userName != null and userName != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
+        <if test="enterpriseId != null and enterpriseId != ''">enterprise_id,</if>
+        <if test="userType != null and userType != ''">user_type,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="avatar != null and avatar != ''">avatar,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
-        <if test="enterpriseId != null and enterpriseId != ''">enterprise_id,</if>
-        <if test="userType != null and userType != ''">user_type,</if>
         <if test="password != null and password != ''">password,</if>
         <if test="status != null and status != ''">status,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>