Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!270

src/main/java/cn/timer/api/config/enums/PinType.java

@@ -19,7 +19,9 @@ public enum PinType {
 	CHANGE_PASSWORD("SMS_178485360", "修改密码"),
 	CHANGE_INFORMATION("SMS_178485359", "信息变更"),
 	
-	REMIND("SMS_180347486", "短信提醒");
+//	REMIND("SMS_180347486", "短信提醒");
+	REMIND("SMS_193517459", "短信提醒");
+	
 
 	private final String code;
 

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

@@ -71,6 +71,9 @@ public class Auth {
 		Integer empNum = userBean.getEmpNum();
 		QyzxEmpEntAsso qyzxEmpEntAsso = selectMain(orgCode, empNum);
 		if (qyzxEmpEntAsso != null) {
+			if (qyzxEmpEntAsso.getUserType() == SysRoleType.U_TYPE_ADMIN.getType()
+					|| qyzxEmpEntAsso.getUserType() == SysRoleType.U_TYPE_C_ADMIN.getType())
+				return ResultUtil.error("当前用户已是管理员");
 			Integer num = QyzxEmpEntAsso.builder().build()
 					.selectCount(new LambdaQueryWrapper<QyzxEmpEntAsso>().eq(QyzxEmpEntAsso::getOrgCode, orgCode)
 							.eq(QyzxEmpEntAsso::getUserType, SysRoleType.U_TYPE_C_ADMIN.getType()));