Merge branch 'developer' into 'master'

Developer

See merge request !16

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -683,13 +683,7 @@ public class MenuApiServiceImpl implements MenuApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是应用对应的code");
         }
         //临时表（测试环境的菜单数据）
-        List<TabSysMenu> devMenuList;
-        if (tabSysMenu.getProject().equals("gic")) {
-            devMenuList = menuService.listMenuTempForGic(tabSysMenu.getMenuCode());
-        } else {
-            String appId = tabSysMenu.getProject();
-            devMenuList = menuService.listMenuTemp(appId);
-        }
+        List<TabSysMenu> devMenuList = menuService.listMenuTempForGic(tabSysMenu.getMenuCode());
         if (CollectionUtils.isNotEmpty(devMenuList)) {
             devMenuList.forEach(menu -> {
                 TabSysMenu temp = menuService.getMenuByMenuCode(menu.getMenuCode());
@@ -705,6 +699,7 @@ public class MenuApiServiceImpl implements MenuApiService {
                         menu.setParentCode(tabSysMenu.getMenuCode());
                         menu.setMenuVersion(tabSysMenu.getMenuVersion());
                         menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
+                        menu.setProject(tabSysMenu.getProject());
                         //避免冲突
                         menu.setMenuId(null);
                         menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));
@@ -714,6 +709,7 @@ public class MenuApiServiceImpl implements MenuApiService {
                         menu.setParentId(otherLevel.getMenuId());
                         menu.setMenuVersion(tabSysMenu.getMenuVersion());
                         menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
+                        menu.setProject(tabSysMenu.getProject());
                         //避免冲突
                         menu.setMenuId(null);
                         menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));

gic-platform-auth-service/src/main/resources/mapper/TabSysCollaboratorMapper.xml

@@ -259,7 +259,7 @@
   </select>
 
   <update id="deleteByPhoneAndAppId">
-    update tab_sys_collaborator set status = 0
+    update tab_sys_collaborator set status = 0, update_time = now()
     where collaboration_enterprise_id = #{enterpriseId}
     and phone = #{phone}
     and app_id = #{appId}

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuMapper.xml

@@ -371,7 +371,7 @@
     from tab_sys_menu
     where status=1
     <if test="search != null and search != '' ">
-      and ( menu_name like concat('%', #{search}, '%') or menu_code like concat('%', #{search}, '%') or parent_code like concat('%', #{search}, '%')  )
+      and ( menu_name like concat('%', #{search}, '%') or menu_code like concat('%', #{search}, '%') or parent_code like concat('%', #{search}, '%') or menu_url like concat('%', #{search}, '%') )
     </if>
     <if test="isGIC == 1">
       and project = 'gic'