From 3b86da3ef58859c2e37faf3e80fb1692c74bf446 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 24 May 2024 16:44:13 +0800
Subject: [PATCH] bug

---
 .../store/service/impl/ChainStoreInfoServiceImpl.java         | 2 +-
 .../com/fuint/common/service/impl/AccountServiceImpl.java     | 3 ++-
 fuintBackend/pom.xml                                          | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
index ba809b07e..a420816ea 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
@@ -55,7 +55,7 @@ public class ChainStoreInfoServiceImpl extends ServiceImpl<ChainStoreInfoMapper,
         }
         String ancestors = sysDept.getAncestors();
         if (!"0".equals(sysDept.getAncestors())) {
-            ancestors = sysDept.getAncestors()+sysDept.getDeptId();
+            ancestors = sysDept.getAncestors()+ "," +sysDept.getDeptId();
         }
 
         IPage<ChainStoreInfo> res = baseMapper.listVo(page,chainStoreInfo,ancestors);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index aa5680c00..a665d640a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -224,7 +224,8 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         String roleId = param.get("roleIds").toString();
         String accountName = param.get("accountName").toString();
         String accountStatus = param.get("accountStatus").toString();
-        String realName = param.get("realName").toString();
+        String realName = "";
+        if (ObjectUtil.isNotEmpty(param.get("realName"))) realName = param.get("realName").toString();
         String password = param.get("password").toString();
         String mobile = param.get("mobile").toString();
 
diff --git a/fuintBackend/pom.xml b/fuintBackend/pom.xml
index 63614809c..89ccc5776 100644
--- a/fuintBackend/pom.xml
+++ b/fuintBackend/pom.xml
@@ -229,11 +229,11 @@
 
         <!--    mvn install:install-file -DgroupId=yly_sdk -DartifactId=yly_sdk -Dversion=2.2 -Dpackaging=jar -Dfile=D:\workspaces\oilSystem\fuintBackend\lib\yly_sdk_2.2.jar-->
 
-        <!--<dependency>
+        <dependency>
             <groupId>yly_sdk</groupId>
             <artifactId>yly_sdk</artifactId>
             <version>2.2</version>
-        </dependency>-->
+        </dependency>
 
     </dependencies>