Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart

 Conflicts:
	src/main/resources/application.properties

src/main/java/com/baosight/hggp/hg/dm/sql/HGDM099.xml

@@ -29,7 +29,7 @@
 
     <sql id="condition">
         AND A.DELETE_FLAG = '0'
-        <include refid="SqlBase.authCondition"/>
+        <include refid="HGXSDataAuth.authConditionA"/>
         <isNotEmpty prepend=" AND " property="id">
             A.ID = #id#
         </isNotEmpty>

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -296,7 +296,8 @@
         SET
         COMPANY_CODE = #companyCode#,
         COMPANY_NAME = #companyName#,
-        PROJ_NAME = #projName#
+        PROJ_NAME = #projName#,
+        <include refid="SqlBase.updateRevise"/>
         WHERE PROJ_CODE = #projCode#
     </update>
 

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java

@@ -173,13 +173,13 @@ public class ServiceHGSJ001 extends ServiceEPBase {
     public List<String> getOrgId(){
         Map<String, Object> orgMap = new HashMap();
         List<Org> orgList = HGXSTools.XsOrg.queryByUser();
-	    if (CollectionUtils.isNotEmpty(orgList)) {
+        if (CollectionUtils.isNotEmpty(orgList)){
             Org org = orgList.get(0);
             if (!org.getOrgType().equals("company")) {
                 //如果不是公司公司，则找到上一级
                 Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-			    orgMap.put("orgId", org1.getParentOrgId());
-		    } else {
+                orgMap.put("orgId",org1.getParentOrgId());
+            }else {
                 orgMap.put("orgId", org.getParentOrgId());
             }
         }
@@ -194,4 +194,21 @@ public class ServiceHGSJ001 extends ServiceEPBase {
         return strList;
     }
 	
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "仓库档案", operType = "查询", operDesc = "下拉框")
+	public EiInfo queryComboBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.PROCESS_CODE_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询工序失败");
+		}
+		return inInfo;
+	}
 }