Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

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/jxgl/service/JxglServiceImpl.java

@@ -36,8 +36,7 @@ public class JxglServiceImpl implements JxglService {
 		performanceRating.setName("C");
 		performanceRating.setSectionMinScore(0);
 		performanceRating.setSectionMaxScore(60);
-		performanceRating.setRanks(0);
-		
+		performanceRating.setRanks(1);
 		res = !performanceRating.insert() && res ? false : res;
 		
 		performanceRating.setId(null);
@@ -45,7 +44,7 @@ public class JxglServiceImpl implements JxglService {
 		performanceRating.setName("B");
 		performanceRating.setSectionMinScore(60);
 		performanceRating.setSectionMaxScore(80);
-		performanceRating.setRanks(0);
+		performanceRating.setRanks(2);
 		res = !performanceRating.insert() && res ? false : res;
 		
 		performanceRating.setId(null);
@@ -53,7 +52,7 @@ public class JxglServiceImpl implements JxglService {
 		performanceRating.setName("A");
 		performanceRating.setSectionMinScore(80);
 		performanceRating.setSectionMaxScore(100);
-		performanceRating.setRanks(0);
+		performanceRating.setRanks(3);
 		res = !performanceRating.insert() && res ? false : res;
 		
 		return res;

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()));

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -127,6 +127,9 @@ public class SpmkController {
 	@Autowired
 	private SpmkInitiatorConfigMapper spmkInitiatorConfigMapper;
 	
+	@Autowired
+	private SpmkAssoBusinessFactory spmkAssoBusinessFactory;
+	
 	private boolean ISFIRST = true; // 第一次启动审批流程
 	
 	//TODO 审批模板组
@@ -146,7 +149,6 @@ public class SpmkController {
 		
         return spmkApprovalTemplateG.insertOrUpdate() ? 
         		ResultUtil.data(spmkApprovalTemplateG) : ResultUtil.error();
-
 	}
 	
 	/**
@@ -160,10 +162,8 @@ public class SpmkController {
 		if (spmkApprovalTemplateMapper.selectCount(new QueryWrapper<SpmkApprovalTemplate>().lambda().eq(SpmkApprovalTemplate::getApprovalTemplateGId, id)) > 0 ) 
 			return ResultUtil.error("审批模板组存在 模板，不可直接删除!");
 		
-		
         return SpmkApprovalTemplateG.builder().id(id).build().deleteById() ? 
         		ResultUtil.success() : ResultUtil.error("没有找到该对象");
-		
 	}
 	
 	/**
@@ -652,9 +652,6 @@ public class SpmkController {
 		return ResultUtil.data(adD);
 	}
 	
-	@Autowired
-	private SpmkAssoBusinessFactory spmkAssoBusinessFactory;
-	
 	//TODO 审批人审批
 	/**
 	 * 审批人审批

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -1799,7 +1799,7 @@ public class YgglController {
 	@ApiOperation(value = "71.获取用户头像", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 71)
 	public Result<List<YgglMainEmp>> headphotos(@CurrentUser UserBean userBean, @RequestBody List<Integer> empNumList) {
-		if (empNumList.size() == 0) {
+		if (empNumList == null || empNumList.size() == 0) {
 			return ResultUtil.error("请输入empNum数组");
 		}
 		List<YgglMainEmp> yglList = YgglMainEmp.builder().build()

src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml

@@ -110,7 +110,7 @@
                 c.remarks            c_remarks,
                 c.type               c_type,
                 c.create_time        c_create_time,
-                c.level               c_level
+                c.level              c_level
     </sql>
     
     <sql id="Base_Column_List_Alias">