|
|
@@ -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){
|