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

src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java

@@ -58,6 +58,9 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value = "电话号码 ", example = "18712345678")
 	@ApiModelProperty(value = "电话号码 ", example = "18712345678")
 	private String phone;
 	private String phone;
 
 
+	@ApiModelProperty(value = "邮编 ", example = "110000")
+	private String zipCode;
+	
 	@ApiModelProperty(value = "所在地区id", example = "广东省广州市白云区")
 	@ApiModelProperty(value = "所在地区id", example = "广东省广州市白云区")
 	private String area;
 	private String area;
 	
 	

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

@@ -92,6 +92,8 @@ public class Auth {
 		Integer empNum = userBean.getEmpNum();
 		Integer empNum = userBean.getEmpNum();
 		QyzxEmpEntAsso qyzxEmpEntAsso = selectMain(orgCode, empNum);
 		QyzxEmpEntAsso qyzxEmpEntAsso = selectMain(orgCode, empNum);
 		if (qyzxEmpEntAsso != null) {
 		if (qyzxEmpEntAsso != null) {
+			if (qyzxEmpEntAsso.getUserType() == SysRoleType.U_TYPE_ADMIN.getType())
+				return ResultUtil.error("主账号暂时不能删除");
 			if (QyzxEmpEntAsso.builder().userType(SysRoleType.U_TYPE_EMP.getType()).build()
 			if (QyzxEmpEntAsso.builder().userType(SysRoleType.U_TYPE_EMP.getType()).build()
 					.update(new LambdaQueryWrapper<QyzxEmpEntAsso>().eq(QyzxEmpEntAsso::getOrgCode, orgCode)
 					.update(new LambdaQueryWrapper<QyzxEmpEntAsso>().eq(QyzxEmpEntAsso::getOrgCode, orgCode)
 							.eq(QyzxEmpEntAsso::getEmpNum, childEmpNum)))
 							.eq(QyzxEmpEntAsso::getEmpNum, childEmpNum)))

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

@@ -298,7 +298,8 @@ public class QyzxBusinessController {
 						.eq(QyzxUseRecord::getPmid, 1)
 						.eq(QyzxUseRecord::getPmid, 1)
 						.eq(StringUtils.isNotBlank(orderNo), QyzxUseRecord::getOrderNo, orderNo)
 						.eq(StringUtils.isNotBlank(orderNo), QyzxUseRecord::getOrderNo, orderNo)
 						.ge(StringUtils.isNotBlank(startTime), QyzxUseRecord::getCreateTime, startTime)
 						.ge(StringUtils.isNotBlank(startTime), QyzxUseRecord::getCreateTime, startTime)
-						.le(StringUtils.isNotBlank(endTime), QyzxUseRecord::getCreateTime, endTime));
+						.le(StringUtils.isNotBlank(endTime), QyzxUseRecord::getCreateTime, endTime)
+						.last("order by create_time desc"));
 		return ResultUtil.pageData(list, page.getTotal(), "查询成功");
 		return ResultUtil.pageData(list, page.getTotal(), "查询成功");
 	}
 	}