修改单位系统列表下拉有多个的问题

src/main/java/com/miniframe/bisiness/es/ES0024Service.java

@@ -1,5 +1,7 @@
 package com.miniframe.bisiness.es;
 
+import tk.mybatis.mapper.entity.Example;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -7,12 +9,11 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.es.model.ES0024BaseModel;
 import com.miniframe.generate.comm.es.D_ES0024_ROWS_RECODE;
-import com.miniframe.model.es.EsUnitSys;
-import com.miniframe.model.es.EsUnitSysUs;
-import com.miniframe.model.es.EsUnitSysUsSQLBuilder;
+import com.miniframe.model.es.*;
 import com.miniframe.model.es.dao.EsUnitSysMapper;
 import com.miniframe.model.es.dao.EsUnitSysUsMapper;
 
+
 /**
  * 无锡发动机,“单位系统查看”逻辑处理（重新生成不覆盖）。
  */
@@ -25,18 +26,39 @@ public class ES0024Service extends ES0024BaseModel implements ExecProcessFlow {
  	 */
 	public void transExecute() throws Exception {
 		EsUnitSysMapper esUnitSysMapper = UtilTools.getBean(EsUnitSysMapper.class);
-		List<EsUnitSys> esUnitSysList = esUnitSysMapper.selectAll();
+
+		//List<EsUnitSys> esUnitSysList = esUnitSysMapper.selectAll();
+		//查找用户个人单位系统
+		EsUnitSysSQLBuilder usb = new EsUnitSysSQLBuilder();
+		EsUnitSysSQLBuilder.Criteria usc = usb.createCriteria();
+		usc.andUidEqualTo(this.getA_eshead().getUserId());
+		List<EsUnitSys> esUnitSysList = esUnitSysMapper.selectByExample(usb);
+
+		//查找系统单位系统
+		/*EsUnitSysSQLBuilder systemSql = new EsUnitSysSQLBuilder();
+		EsUnitSysSQLBuilder.Criteria systemSqlCriteria = systemSql.createCriteria();
+		systemSqlCriteria.andTypeEqualTo(1);
+		EsUnitSys esUnitSystem = esUnitSysMapper.selectOneByExample(systemSqlCriteria);*/
+		Example example = new Example(EsUnitSys.class);
+		example.createCriteria()
+				.andEqualTo("type", 1);
+		EsUnitSys esUnitSystem = esUnitSysMapper.selectOneByExample(example);
+
+		//将系统单位加入列表
+		esUnitSysList.add(esUnitSystem);
+
 		List<D_ES0024_ROWS_RECODE> dEs0024RowsRecodes = new ArrayList<D_ES0024_ROWS_RECODE>();
 		for(EsUnitSys esUnitSys:esUnitSysList){
 			D_ES0024_ROWS_RECODE dEs0024RowsRecode = new D_ES0024_ROWS_RECODE();
 			dEs0024RowsRecode.setNameEn(esUnitSys.getNameEn());
-			dEs0024RowsRecode.setNameZn(esUnitSys.getNameEn());
+			dEs0024RowsRecode.setNameZn(esUnitSys.getNameZh());
 			dEs0024RowsRecode.setSutId(esUnitSys.getSutId());
 			dEs0024RowsRecodes.add(dEs0024RowsRecode);
 		}
 		EsUnitSysUsMapper usMapper =UtilTools.getBean(EsUnitSysUsMapper.class);
 		EsUnitSysUsSQLBuilder usSb = new EsUnitSysUsSQLBuilder();
 		EsUnitSysUsSQLBuilder.Criteria ussc = usSb.createCriteria();
+
 		ussc.andUidEqualTo(this.getA_eshead().getUserId());
 		List<EsUnitSysUs> usList = usMapper.selectByExample(usSb);
 		if(!usList.isEmpty()){