合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -330,8 +330,6 @@ public class UserServiceImpl implements IUserService {
         String auth = "分解任务";
         List<String> departmentList1 = findDepartmentList(userId,auth);
         if(departmentList1!=null){
-
-
             for (String de : departmentList1) {
                 if(departmentList!=null){
                     if(!departmentList.contains(de)){

notes-union/src/main/resources/application.properties

@@ -12,7 +12,7 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://192.168.1.246:27017/notes2
+spring.data.mongodb.uri=mongodb://192.168.1.246:27017/notes3
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB