Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!208

src/main/java/cn/timer/api/controller/LoginController.java

@@ -517,8 +517,9 @@ public class LoginController {
 				}
 				}
 				login = qyzxEmpLogin;
 				login = qyzxEmpLogin;
 			}
 			}
+			// 1-是主账号管理员
 			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
 			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
-					.isManager(SysRoleType.U_TYPE_ADMIN.getType()).name(username).phone(phone)
+					.isManager(1).name(username).phone(phone)
 					.jobType(YgJobType.QUANZHI.getType()).jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build()
 					.jobType(YgJobType.QUANZHI.getType()).jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build()
 					.insert();
 					.insert();
 			if (!b4) {
 			if (!b4) {

src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java

@@ -8,6 +8,8 @@
 package cn.timer.api.controller.qyzx;
 package cn.timer.api.controller.qyzx;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -183,6 +185,8 @@ public class QyzxAuthController {
 						.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
 						.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
 								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
 								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
 		child.add(main);
 		child.add(main);
+
+		Collections.sort(child, Comparator.comparing(YgglMainEmp::getIsManager));
 		return ResultUtil.data(child, "查询成功");
 		return ResultUtil.data(child, "查询成功");
 	}
 	}