Explorar o código

修改——企业用户,部门为空的判断异常

zhouhaijun hai 1 semana
pai
achega
49ac7beda6

+ 1 - 1
src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -71,7 +71,7 @@ public class GyDataServiceImpl implements GyDataService {
     public List<GyDataImportDTO> list(Map<String, Object> map) {
         UserDO currUser = ShiroUtils.getUser();
         log.info("currUser:" + currUser.toString());
-        if (!managerValue.contains(currUser.getDeptId().toString())) {
+        if (currUser.getDeptId() == null || !managerValue.contains(currUser.getDeptId().toString())) {
             String province = currUser.getProvince();
             if(StringUtils.isEmpty(province)){
                 province = sysProvince;

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

@@ -21,9 +21,9 @@ spring:
 #    开发环境
 #  active: dev
 #    测试环境
-#   active: test
+   active: test
 #    #生产环境
-    active: prod
+#    active: prod
   servlet:
     multipart:
       max-file-size: 30Mb