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

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

@@ -91,11 +91,23 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众",example="101")
 	@ApiModelProperty(value="政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众",example="101")
     private Integer zzmm;
     private Integer zzmm;
     
     
-	@ApiModelProperty(value="籍贯 省/市/区 例：广东/广州/白云",example="101")
+	@ApiModelProperty(value="籍贯 省",example="101")
     private String jg;
     private String jg;
-    
-	@ApiModelProperty(value="户籍城市 省/市/区 例：广东/广州/白云",example="101")
-    private Integer city;
+	@ApiModelProperty(value="籍贯 省id",example="101")
+    private String jgId;
+    
+	@ApiModelProperty(value = "省")
+	private String province;
+	@ApiModelProperty(value = "省id")
+	private String provinceId;
+	@ApiModelProperty(value = "市")
+	private String city;
+	@ApiModelProperty(value = "市id")
+	private String cityId;
+	@ApiModelProperty(value = "区")
+	private String district;
+	@ApiModelProperty(value = "区编号")
+	private String districtId;
     
     
 	@ApiModelProperty(value="户口性质 1:城镇户口;2:农村户口;3:居民户口",example="101")
 	@ApiModelProperty(value="户口性质 1:城镇户口;2:农村户口;3:居民户口",example="101")
     private Integer hkType;
     private Integer hkType;

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

@@ -517,8 +517,9 @@ public class LoginController {
 				}
 				}
 				login = qyzxEmpLogin;
 				login = qyzxEmpLogin;
 			}
 			}
+			// 1-是主账号管理员
 			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
 			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()
 					.jobType(YgJobType.QUANZHI.getType()).jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build()
 					.insert();
 					.insert();
 			if (!b4) {
 			if (!b4) {

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -112,7 +112,7 @@ public class DzhtController2 {
 			String name = yg.getName();
 			String name = yg.getName();
 			Integer type = yg.getZjType();
 			Integer type = yg.getZjType();
 			String idType = null;
 			String idType = null;
-			if (type == null) 
+			if (type == null)
 				return "IDCARD-ERROR";
 				return "IDCARD-ERROR";
 			if (type == 0) {
 			if (type == 0) {
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
@@ -469,10 +469,10 @@ public class DzhtController2 {
 		}
 		}
 
 
 		if (quantity == null || remainder == null || remainder <= 0) {
 		if (quantity == null || remainder == null || remainder <= 0) {
-			return ResultUtil.error("企业 " + orgCode + " :套餐余额不足，请充值购买后使用");
+			return ResultUtil.error("当前企业套餐余额不足，请充值购买后使用");
 		}
 		}
 		if (date != null && date.getTime() <= new Date().getTime()) {
 		if (date != null && date.getTime() <= new Date().getTime()) {
-			return ResultUtil.error("企业 " + orgCode + " :电子合同套餐已过期");
+			return ResultUtil.error("当前企业电子合同套餐已过期");
 		}
 		}
 
 
 		// ConfigInfo cfgInfo = new ConfigInfo(null, "1,2", null, null);
 		// ConfigInfo cfgInfo = new ConfigInfo(null, "1,2", null, null);

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

@@ -8,6 +8,8 @@
 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.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -183,6 +185,8 @@ public class QyzxAuthController {
 						.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
 						.eq(YgglMainEmp::getIsManager, 2).select(YgglMainEmp::getName, YgglMainEmp::getPhone,
 								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
 								YgglMainEmp::getEmpNum, YgglMainEmp::getIsManager));
 		child.add(main);
 		child.add(main);
+
+		Collections.sort(child, Comparator.comparing(YgglMainEmp::getIsManager));
 		return ResultUtil.data(child, "查询成功");
 		return ResultUtil.data(child, "查询成功");
 	}
 	}