Merge branch 'dsc' into 'develop'

冲突解决

See merge request 8timerv2/8timerapiv200!228

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

@@ -42,7 +42,6 @@ import cn.timer.api.bean.dzht.DzhtAssoQyyz;
 import cn.timer.api.bean.dzht.DzhtAssoQyzc;
 import cn.timer.api.bean.dzht.DzhtAssoQyzc;
 import cn.timer.api.bean.dzht.DzhtAssoSdgzq;
 import cn.timer.api.bean.dzht.DzhtAssoSdgzq;
 import cn.timer.api.bean.dzht.DzhtAssoTpyz;
 import cn.timer.api.bean.dzht.DzhtAssoTpyz;
-import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
 import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
 import cn.timer.api.bean.qyzx.businessService.QyzxUseRecord;
 import cn.timer.api.bean.qyzx.businessService.QyzxUseRecord;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
@@ -206,16 +205,16 @@ public class DzhtController2 {
 	@GetMapping("/getOrganizations")
 	@GetMapping("/getOrganizations")
 	@ApiOperation(value = "查询企业信息s", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "查询企业信息s", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getOrganizations(@CurrentUser UserBean userBean) {
 	public Result<Object> getOrganizations(@CurrentUser UserBean userBean) {
-		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build().selectList(
-				new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
-		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
+//		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build().selectList(
+//				new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
+//		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
 		List<String> orgIds = new ArrayList<String>();
 		List<String> orgIds = new ArrayList<String>();
-		for (Integer orgCode : orgCodeList) {
+//		for (Integer orgCode : orgCodeList) {
 			DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
 			DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
-					.eq(DzhtAssoQyzc::getOrgCode, orgCode).select(DzhtAssoQyzc::getOrgId));
+					.eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId));
 			if (qyzc != null)
 			if (qyzc != null)
 				orgIds.add(qyzc.getOrgId());
 				orgIds.add(qyzc.getOrgId());
-		}
+//		}
 		JSONObject j = null;
 		JSONObject j = null;
 		List<JSONObject> result = new ArrayList<JSONObject>();
 		List<JSONObject> result = new ArrayList<JSONObject>();
 		try {
 		try {

src/main/java/cn/timer/api/utils/router/business/EvectionBusiness.java

@@ -2,6 +2,8 @@ package cn.timer.api.utils.router.business;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
 
 
+import javax.annotation.PostConstruct;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -47,7 +49,7 @@ public class EvectionBusiness extends SpmkAssoBusiness {
 		String businessTrip = ObjectUtil.isNull(jsonObj.get("__businessTrip",FromData.class)) ? null : jsonObj.get("__businessTrip",FromData.class).getValue();
 		String businessTrip = ObjectUtil.isNull(jsonObj.get("__businessTrip",FromData.class)) ? null : jsonObj.get("__businessTrip",FromData.class).getValue();
 		// 上传文件
 		// 上传文件
 		String UploadAttachment = ObjectUtil.isNull(jsonObj.get("UploadAttachment",FromData.class)) ? null : jsonObj.get("UploadAttachment",FromData.class).getValue();
 		String UploadAttachment = ObjectUtil.isNull(jsonObj.get("UploadAttachment",FromData.class)) ? null : jsonObj.get("UploadAttachment",FromData.class).getValue();
-		
+		System.out.println(approveId);
 		AttEvectionApprovalDto eaD = AttEvectionApprovalDto
 		AttEvectionApprovalDto eaD = AttEvectionApprovalDto
 				.builder()
 				.builder()
 				.userid(id)
 				.userid(id)