Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!248

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -202,8 +202,8 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="手机APPid",example="appopenid手机app")
 	@ApiModelProperty(value="手机APPid",example="appopenid手机app")
     private String appopenid;
     private String appopenid;
 	
 	
-	@ApiModelProperty(value="是否企业中心管理员 ",example="0-否 1-主账号 2-子账号")
-    private Integer isManager;
+//	@ApiModelProperty(value="是否企业中心管理员 ",example="0-否 1-主账号 2-子账号")
+//    private Integer isManager;
 	
 	
 	@ApiModelProperty(value="离职前状态 1试用、2正式 ",example="1试用、2正式")
 	@ApiModelProperty(value="离职前状态 1试用、2正式 ",example="1试用、2正式")
 	private Integer beforeLeavingSts;
 	private Integer beforeLeavingSts;

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

@@ -535,10 +535,13 @@ public class LoginController {
 					return ResultUtil.error("注册企业失败2");
 					return ResultUtil.error("注册企业失败2");
 				}
 				}
 				login = qyzxEmpLogin;
 				login = qyzxEmpLogin;
+			} else {
+				login.setOrgId(qyId);
+				login.updateById();
 			}
 			}
 			// 员工信息
 			// 员工信息
-			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
-					.name(username).phone(phone).workEmail(email).jobType(YgJobType.QUANZHI.getType())
+			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date()).name(username)
+					.phone(phone).workEmail(email).jobType(YgJobType.QUANZHI.getType())
 					.jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build().insert();
 					.jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build().insert();
 			if (!b4) {
 			if (!b4) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

 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.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -40,7 +38,6 @@ import cn.timer.api.bean.qyzx.QyzxLogBuy;
 import cn.timer.api.bean.qyzx.QyzxOperLog;
 import cn.timer.api.bean.qyzx.QyzxOperLog;
 import cn.timer.api.bean.qyzx.QyzxPayServe;
 import cn.timer.api.bean.qyzx.QyzxPayServe;
 import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
 import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
-import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
@@ -479,17 +476,17 @@ public class QyzxController {
 //		IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery(page, qyzxOperLogQuaryDto);
 //		IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery(page, qyzxOperLogQuaryDto);
 
 
 		if (qyzxOperLogQuaryDto.getEmpNums() == null) {
 		if (qyzxOperLogQuaryDto.getEmpNums() == null) {
-			YgglMainEmp main = YgglMainEmp.builder().build()
-					.selectOne(new LambdaQueryWrapper<YgglMainEmp>().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
-							.eq(YgglMainEmp::getIsManager, 1)
-							.select(YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
-			List<YgglMainEmp> child = YgglMainEmp.builder().build()
-					.selectList(new LambdaQueryWrapper<YgglMainEmp>().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
-							.eq(YgglMainEmp::getIsManager, 2)
-							.select(YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
-			child.add(main);
-			Collections.sort(child, Comparator.comparing(YgglMainEmp::getIsManager));
-			List<Integer> empNums = child.stream().map(YgglMainEmp::getEmpNum).collect(Collectors.toList());
+
+			List<Integer> roles = new ArrayList<Integer>();
+			roles.add(SysRoleType.U_TYPE_ADMIN.getType());
+			roles.add(SysRoleType.U_TYPE_C_ADMIN.getType());
+
+			List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build()
+					.selectList(new LambdaQueryWrapper<QyzxEmpEntAsso>()
+							.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
+							.in(QyzxEmpEntAsso::getUserType, roles).select(QyzxEmpEntAsso::getEmpNum));
+
+			List<Integer> empNums = list.stream().map(QyzxEmpEntAsso::getEmpNum).collect(Collectors.toList());
 			qyzxOperLogQuaryDto.setEmpNums(empNums);
 			qyzxOperLogQuaryDto.setEmpNums(empNums);
 		}
 		}
 		IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery2(page, qyzxOperLogQuaryDto);
 		IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery2(page, qyzxOperLogQuaryDto);