Merge remote-tracking branch 'origin/zuhuduan' into V20230915

dsk-admin/src/main/java/com/dsk/DskOperateSysApplication.java

 package com.dsk;
 
+import cn.dev33.satoken.secure.BCrypt;
+import com.google.api.client.util.SecurityUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
 import com.baomidou.lock.annotation.Lock4j;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
@@ -42,7 +43,7 @@ public class SysTenantController extends BaseController {
     /**
      * 查询租户列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:list")
     @GetMapping("/list")
     public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
@@ -66,7 +67,7 @@ public class SysTenantController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:query")
     @GetMapping("/{id}")
     public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
@@ -76,7 +77,7 @@ public class SysTenantController extends BaseController {
     /**
      * 新增租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:add")
     @Log(title = "租户", businessType = BusinessType.INSERT)
     @Lock4j
@@ -92,7 +93,7 @@ public class SysTenantController extends BaseController {
     /**
      * 修改租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -122,7 +123,7 @@ public class SysTenantController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:remove")
     @Log(title = "租户", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
@@ -145,7 +146,7 @@ public class SysTenantController extends BaseController {
     /**
      * 清除动态租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @GetMapping("/dynamic/clear")
     public R<Void> dynamicClear() {
         TenantHelper.clearDynamic();
@@ -158,7 +159,7 @@ public class SysTenantController extends BaseController {
      * @param tenantId  租户id
      * @param packageId 套餐id
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantPackageController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
@@ -46,7 +47,7 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/list")
     public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
@@ -56,7 +57,7 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐下拉选列表
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/selectList")
     public R<List<SysTenantPackageSelectVo>> selectList() {
@@ -80,7 +81,7 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageId 主键
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:query")
     @GetMapping("/{packageId}")
     public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) {
@@ -90,7 +91,7 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 新增租户套餐
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:add")
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @RepeatSubmit()
@@ -105,7 +106,7 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 修改租户套餐
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -134,7 +135,7 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageIds 主键串
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
     @SaCheckPermission("system:tenantPackage:remove")
     @Log(title = "租户套餐", businessType = BusinessType.DELETE)
     @DeleteMapping("/{packageIds}")

dsk-common/src/main/java/com/dsk/common/constant/TenantConstants.java

@@ -37,6 +37,16 @@ public interface TenantConstants {
      */
     String TENANT_ADMIN_ROLE_NAME = "管理员";
 
+    /**
+     * 大司空租户管理员角色
+     */
+    String DSK_TENANT_ADMIN_ROLE_KEY = "accountAdmin";
+
+    /**
+     * 大司空租户管理员角色名称
+     */
+    String DSK_TENANT_ADMIN_ROLE_NAME = "企业账号管理员";
+
     /**
      * 默认租户ID
      */

dsk-module/dsk-biz-api/pom.xml

@@ -56,11 +56,6 @@
             <artifactId>fastjson2</artifactId>
             <version>2.0.25</version>
         </dependency>
-<!--        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <version>5.3.2</version>
-        </dependency>-->
 
 
         <!--        <dependency>-->

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/EnterpriseProjectController.java

@@ -151,5 +151,16 @@ public class EnterpriseProjectController {
         return enterpriseProjectService.importantDetail(body);
     }
 
+    /***
+     *@Description: 公招市场-流程速览
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/19 13:49
+     */
+    @RequestMapping(value = "/projectProcess", method = RequestMethod.POST)
+    public R projectProcess(@RequestBody @Valid EnterpriseProjectProcessDetailBody body) throws Exception {
+        return enterpriseProjectService.projectProcess(body);
+    }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectProcessDetailBody.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectProcessDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String projectId;
+
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseProjectService.java

@@ -205,4 +205,16 @@ public class EnterpriseProjectService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/importantDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    /***
+     *@Description: 公招市场-流程速览
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/19 13:49
+     */
+    public R projectProcess(EnterpriseProjectProcessDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/recruitmentMarket/projectProcess", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -91,12 +91,12 @@
     iframeLoading() {
       let iframeHeight = document.getElementById("companyIframe").clientHeight, number = 0
       this.iframeTimer = setInterval(()=>{
-        number ++
-        if(document.getElementById("companyIframe").clientHeight != iframeHeight || number == 5000){
+        number = number+1000
+        if(document.getElementById("companyIframe").clientHeight != iframeHeight || number == 3000){
           this.loading = false
           clearInterval(this.iframeTimer)
         }
-      })
+      },1000)
     }
   }
 }

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -154,7 +154,7 @@
 </template>
 
 <script>
-  import { treeselect as qytreeselect} from "@/api/system/menu";
+  import { qytreeselect} from "@/api/system/menu";
 
 
   import { addTenantPackage ,getTenantPackage,detailTenantPackage,saveTenantPackage,deleteTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";

dsk-operate-ui/src/views/login.vue

@@ -24,6 +24,7 @@
         <el-form-item prop="captchaCode" v-if="captchaEnabled">
           <el-input
             v-model="dxform.captchaCode"
+            @focus="getCode"
             auto-complete="off"
             placeholder="请输入图形验证码"
             style="width: 196px;float: left;"
@@ -92,6 +93,7 @@
             v-model="loginForm.code"
             auto-complete="off"
             placeholder="请输入图形验证码"
+            @focus="getCode"
             style="width: 196px;float: left;"
             @keyup.enter.native="handleLogin"
           >
@@ -130,6 +132,7 @@
         <el-form-item prop="captchaCode" v-if="captchaEnabled && showcode">
           <el-input
             v-model="dxform.captchaCode"
+            @focus="getCode"
             auto-complete="off"
             placeholder="请输入验证码"
             style="width: 196px;float: left;"

dsk-system/src/main/java/com/dsk/system/mapper/SysUserMapper.java

@@ -92,4 +92,10 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      */
     SysUser selectUserById(Long userId);
 
+
+    List<SysUser> selectUserByTenantPhone(String phonenumber);
+
+    List<SysUser> selectUserByTenantUsername(String username);
+
+
 }

dsk-system/src/main/java/com/dsk/system/service/SysLoginService.java

@@ -525,7 +525,7 @@ public class SysLoginService {
         }
         SysTenantVo tenant = sysTenantService.queryByTenantId(tenantId);
         if (ObjectUtil.isNull(tenant)) {
-            log.info("登录企业：{} 不存在.", tenant.getCompanyName());
+            log.info("登录企业：{} 不存在.", tenantId);
             RedisUtils.deleteObject(GlobalConstants.PHONE_DEFAULT_TENANT + phoneNumber);
             return null;
         } else if (TenantStatus.DISABLE.getCode().equals(tenant.getStatus())) {

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -97,10 +97,12 @@ public class SysMenuServiceImpl implements ISysMenuService {
             menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
                     .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
                     .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
-                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(SysMenu::getStatus, "0")
                     .orderByAsc(SysMenu::getParentId)
                     .orderByAsc(SysMenu::getOrderNum));
-            menuList = menuList.stream().filter(menu1 -> !menu1.getMenuName().equals("企业管理")).collect(Collectors.toList());
+
+            //过滤企业管理权限,考虑今后权限名称可能会修改,因此以ID作为判断依据
+            menuList = menuList.stream().filter(menu1 -> menu1.getMenuId() != 1693803090698280961L).collect(Collectors.toList());
         }
         return menuList;
     }
@@ -183,11 +185,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (CollUtil.isEmpty(menus)) {
             return CollUtil.newArrayList();
         }
-        return TreeBuildUtils.build(menus, (menu, tree) ->
-                tree.setId(menu.getMenuId())
-                        .setParentId(menu.getParentId())
-                        .setName(menu.getMenuName())
-                        .setWeight(menu.getOrderNum()));
+        return TreeBuildUtils.build(menus, (menu, tree) -> tree.setId(menu.getMenuId())
+                .setParentId(menu.getParentId())
+                .setName(menu.getMenuName())
+                .setWeight(menu.getOrderNum()));
     }
 
     /**

dsk-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -139,6 +139,21 @@
         <include refid="selectUserVo"/>
         where u.del_flag = '0' and u.user_id = #{userId}
     </select>
+    <select id="selectUserByTenantPhone" resultType="com.dsk.system.domain.SysUser">
+        select t1.user_id, t1.tenant_id,t1.user_name,t1.status from sys_user t1
+        inner join sys_tenant t on t1.tenant_id=t.tenant_id and t1.del_flag=0
+        where t.del_flag=0
+        and t.status=0
+        and t1.phonenumber=#{phonenumber}
+        order by t1.create_time desc
+    </select>
 
-
+    <select id="selectUserByTenantUsername" resultType="com.dsk.system.domain.SysUser">
+        select t1.user_id, t1.tenant_id,t1.user_name,t1.status from sys_user t1
+        left join sys_tenant t on t1.tenant_id=t.tenant_id and t1.del_flag=0
+        where t.del_flag=0
+        and t.status=0
+        and t1.user_name=#{username}
+        order by t1.create_time desc
+    </select>
 </mapper>