对直辖市去重

2code/server/store-system/src/main/java/cn/com/fqy/controller/mapi/IndexController.java

@@ -324,6 +324,9 @@ public class IndexController {
 		}
 		Worker worker = new Worker();
         worker.setStoreId(storeId);
+        worker.setIsShopping(1);
+        worker.setIsAuditing(1);
+        worker.setIsDeleted(0);
 		List<Worker> workerList = workerService.getWorkerList(new Query(worker));
 		if (null != workerList && workerList.size()>0) {
 			resultInfo.setCode("1");

2code/server/store-system/src/main/java/cn/com/fqy/controller/mapi/WebShopController.java

@@ -75,6 +75,9 @@ public class WebShopController {
 		}
 		Store res = storeService.getStore(storeId);
 		if (null != res ) {
+			if(res.getProvince().equals(res.getCityName())) {
+				res.setCityName("");
+			}
 			resultInfo.setCode("1");
 			resultInfo.setData(res);
 		}else {

2code/server/store-system/src/main/java/cn/com/fqy/controller/mapi/WebWorkerController.java

@@ -101,8 +101,12 @@ public class WebWorkerController {
 				map.put("serialNumber",res.getSerialNumber());
 				map.put("storeName",res.getStoreName());
 				map.put("storeBrief",store.getBrief());
-				map.put("storeCityName",store.getCityName());
 				map.put("storeProvince",store.getProvince());
+				if(store.getProvince().equals(store.getCityName())) {
+					map.put("storeCityName","");
+				}else {
+					map.put("storeCityName",store.getCityName());
+				}
 				map.put("storeCounty",store.getCounty());
 				map.put("storeHomePic",store.getStoreHomePic());
 				map.put("storePosition",store.getStorePosition());