问题处理

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -494,17 +494,16 @@ public class EnterpriseController extends WebBaseController {
             vo.setEnterpriseId(enterpriseId);
             vo.setEnterpriseName(enterprise.getEnterpriseName());
             vo.setBrandName(enterprise.getBrandName());
-        }
-        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
-        if (clerk != null) {
-            vo.setClerkId(clerk.getClerkId());
-            vo.setClerkCode(clerk.getClerkCode());
-            vo.setClerkName(clerk.getClerkName());
-            vo.setPhoneNumber(clerk.getPhoneNumber());
-            vo.setNationCode(clerk.getNationcode());
-        }
-        //enterpriseId 参数可以是企业id，也可以是企业名称
-        if(ObjectUtil.isNull(vo)){
+            ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+            if (clerk != null) {
+                vo.setClerkId(clerk.getClerkId());
+                vo.setClerkCode(clerk.getClerkCode());
+                vo.setClerkName(clerk.getClerkName());
+                vo.setPhoneNumber(clerk.getPhoneNumber());
+                vo.setNationCode(clerk.getNationcode());
+            }
+        }else {
+            //enterpriseId 参数可以是企业id，也可以是企业名称
             //按名称去查
             EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseId);
             vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -226,17 +226,16 @@ public class WxEnterpriseController extends WebBaseController {
             vo.setEnterpriseId(enterpriseId);
             vo.setEnterpriseName(enterprise.getEnterpriseName());
             vo.setBrandName(enterprise.getBrandName());
-        }
-        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
-        if (clerk != null) {
-            vo.setClerkId(clerk.getClerkId());
-            vo.setClerkCode(clerk.getClerkCode());
-            vo.setClerkName(clerk.getClerkName());
-            vo.setPhoneNumber(clerk.getPhoneNumber());
-            vo.setNationCode(clerk.getNationcode());
-        }
-        //enterpriseId 参数可以是企业id，也可以是企业名称
-        if(ObjectUtil.isNull(vo)){
+            ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+            if (clerk != null) {
+                vo.setClerkId(clerk.getClerkId());
+                vo.setClerkCode(clerk.getClerkCode());
+                vo.setClerkName(clerk.getClerkName());
+                vo.setPhoneNumber(clerk.getPhoneNumber());
+                vo.setNationCode(clerk.getNationcode());
+            }
+        }else {
+            //enterpriseId 参数可以是企业id，也可以是企业名称
             //按名称去查
             EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseId);
             vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);