Browse Source

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 7 years ago
parent
commit
403ea6916d

+ 5 - 3
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.UUID;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -254,10 +255,11 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 
 	@Override
 	public int insertNewAdmin(Admin ad ,List<String> roleIds) {
-		ad.setStatus("正常");		
-		String sdepNo=adminMapper.selectUserNoBySuperiorId(ad.getSuperiorId());
+		ad.setStatus("正常");
+		ad.setId(UUID.randomUUID().toString());
+		/*String sdepNo=adminMapper.selectUserNoBySuperiorId(ad.getSuperiorId());
 		int Count=adminMapper.selectCountBySuperiorId(ad.getSuperiorId());
-		/*if(Count<10){
+		if(Count<10){
 			String dep=sdepNo+"0"+Count;
 			String sid=adminMapper.selectIdByUserNo(dep);
 			while(sid!=null){

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://192.168.1.102:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801