Commit b974b3f5 by 邓实川 Committed by chenzg

系统优化

parent 13375434
......@@ -517,8 +517,9 @@ public class LoginController {
}
login = qyzxEmpLogin;
}
// 1-是主账号管理员
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()
.insert();
if (!b4) {
......
......@@ -8,6 +8,8 @@
package cn.timer.api.controller.qyzx;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
......@@ -183,6 +185,8 @@ public class QyzxAuthController {
.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
child.add(main);
Collections.sort(child, Comparator.comparing(YgglMainEmp::getIsManager));
return ResultUtil.data(child, "查询成功");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment