Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java

@@ -98,4 +98,11 @@ public interface IPileMerchantInfoService {
     List<PileMerchantInfo> queryFirstLevelMerchant();
 
     String queryAppIdByMerchantId(String merchantId);
+
+	/**
+	 * 通过appid获取运营商部门id
+	 * @param appId
+	 * @return
+	 */
+	List<String> getDeptIdsByAppId(String appId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -378,5 +378,15 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 		return appId;
 	}
 
+	/**
+	 * 通过appid查询运营商部门id
+	 * @param appId
+	 * @return
+	 */
+    @Override
+    public List<String> getDeptIdsByAppId(String appId) {
+        return pileMerchantInfoMapper.getDeptIdsByAppId(appId);
+    }
+
 
 }