组织机构bugfix

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801A.java

@@ -62,9 +62,8 @@ public class ServiceXSOG0801A extends ServiceEPBase {
 				} else if (OrgTypeEnum.FACTORY.getCode().equals(org.getOrgType())) {
 					condition = String.format(" ITEM_CODE IN ('%s')", OrgTypeEnum.DEPT.getCode());
 				} else if (OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())) {
-					condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s', '%s')", OrgTypeEnum.DEPT.getCode(),
-							OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode(),
-							OrgTypeEnum.SYN_GROUP.getCode());
+					condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.DEPT.getCode(),
+							OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode());
 				} else {
 					condition = " ITEM_CODE = 'NOT CODE'";
 				}

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801B.java

@@ -47,12 +47,16 @@ public class ServiceXSOG0801B extends ServiceEPBase {
 				condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
 						OrgTypeEnum.FACTORY.getCode(), OrgTypeEnum.DEPT.getCode());
 			} else if (OrgTypeEnum.FACTORY.getCode().equals(org.getOrgType())) {
-				condition = String.format(" ITEM_CODE IN ('%s')", OrgTypeEnum.DEPT.getCode());
+				condition = String.format(" ITEM_CODE IN ('%s')", OrgTypeEnum.FACTORY.getCode());
 			} else if (OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())) {
-				condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s', '%s')", OrgTypeEnum.DEPT.getCode(),
-						OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode(),
-						OrgTypeEnum.SYN_GROUP.getCode());
-			} else {
+				condition = String.format(" ITEM_CODE IN ('%s')", OrgTypeEnum.DEPT.getCode());
+//						, OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode(),
+//						OrgTypeEnum.SYN_GROUP.getCode());
+			} else if (OrgTypeEnum.PROD_GROUP.getCode().equals(org.getOrgType())
+					||OrgTypeEnum.CUT_GROUP.getCode().equals(org.getOrgType())){
+				condition = String.format(" ITEM_CODE IN ('%s', '%s')",
+						OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode());
+			}else {
 				condition = " ITEM_CODE = 'NOT CODE'";
 			}
 			List<Map> orgTypes = CodeValueTools.getCodeValues(CodesetConstant.XsOg.ORG_TYPE, condition);