Merge branch 'developer' into 'master'

Developer

See merge request !35

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/EnterpriseInitApiService.java

@@ -26,9 +26,11 @@ public interface EnterpriseInitApiService {
      * @Description:
     
* @author guojuxing
      * @param enterpriseId

+     * @param operationId 运维操作人ID
+     * @param operationName 运维操作人名称
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
-    ServiceResponse<Void> completeMemberIndex(Integer enterpriseId);
+    ServiceResponse<Void> completeMemberIndex(Integer enterpriseId, Integer operationId, String operationName);
 
     /**
      * 完成商品索引初始化

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseInitApiServiceImpl.java

@@ -87,8 +87,8 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
     }
 
     @Override
-    public ServiceResponse<Void> completeMemberIndex(Integer enterpriseId) {
-        ServiceResponse<Void> memberInitResult = memberInitApiService.configInit(enterpriseId);
+    public ServiceResponse<Void> completeMemberIndex(Integer enterpriseId, Integer operationId, String operationName) {
+        ServiceResponse<Void> memberInitResult = memberInitApiService.configInit(enterpriseId, operationId, operationName);
         if (memberInitResult.isSuccess()) {
             return initByConfigCode(EnterpriseInitCodeEnum.COMPLETE_MEMBER_INDEX.getCode(), enterpriseId);
         }

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -656,7 +656,7 @@ public class EnterpriseController {
 
     @RequestMapping("/init-member-index")
     public RestResponse completeMemberIndex(Integer enterpriseId) {
-        return ResultControllerUtils.commonResult(enterpriseInitApiService.completeMemberIndex(enterpriseId));
+        return ResultControllerUtils.commonResult(enterpriseInitApiService.completeMemberIndex(enterpriseId, UserUtils.getUser().getId(), UserUtils.getUser().getRealName()));
     }
 
     @RequestMapping("/init-goods-index")

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/MenuController.java

@@ -355,7 +355,7 @@ public class MenuController {
 
     private Map<String, String> getMenuVersionMap(MenuDTO dto) {
         Map<String, String> map = new HashMap<>(16);
-        if (dto.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT) && dto.getLevel() == 1) {
+        if (dto.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT)) {
             //如果为空，则是gic新增页面
             map = menuApiService.getGicDefaultVersion().getResult();
         } else {