no message

src/biz/member/authority.ts

@@ -2,7 +2,7 @@
  * 会员管理 【权限管理】
  */
 
-import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, UNITMEMBERTYPE } from "../../config/enum";
+import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, UNITMEMBERTYPE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { findCount, findOnce, findToPage } from "../../data/select";
@@ -10,43 +10,46 @@ import { updateOneData } from "../../data/update";
 import { successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
-import { changeEnumValue } from "../../util/verificationEnum";
+import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 
 
 
 /**
- * 会员权限列表
+ * 会员权限列表 success
  * @param unitName 单位名称
  * @param memberLevel 会员等级、职务 MEMBERLEVEL
  * @param memberCategory 会员类别、会员级别  UNITMEMBERTYPE、INDIVIDUALMEMBERTYPE
  * @param pageNumber 当前页
  */
- export async function getAuthority({unitName, memberLevel, memberCategory, pageNumber}) {
+ export async function getAuthority({unitName, memberLevel, memberCategory, pageNumber}) {    
+    /**查询条件 */
     let selectParam:any = {};
-
     if (unitName) selectParam.unitName = unitName;
     if (memberLevel) selectParam.memberLevel = memberLevel;
-    if (memberCategory || memberCategory>=9) selectParam.unitMemberType = memberCategory;
-    if (memberCategory || memberCategory<9) selectParam.individualMemberType = memberCategory;
+    if (memberCategory) {
+        if ( memberCategory >= 9) selectParam.unitMemberType = memberCategory;
+        else selectParam.individualMemberType = memberCategory;
+    }
 
-    let selectConf = ["userId", "memberState", "unitName", "memberLevel"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, [], pageNumber, 10);
+    const SelectFiles = ["userId", "memberState", "unitName", "name", "memberLevel", "memberType", "individualMemberType", "unitMemberType"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
+    const ResultFiles = ["userId", "memberState", "memberLevel", "memberType"];
     let dataList = [];
     dbList.forEach(info => {
+        let item:any = extractData(info, ResultFiles);
         if (info.memberType == MEMBERTYPE.个人会员) {
-            selectConf.push("individualMemberType");
-        } else {
-            selectConf.push("unitMemberType");
+            item.unitName = info.name;
+            item.memberCategory = changeEnumValue(INDIVIDUALMEMBERTYPE, item.individualMemberType);//会员类别/级别
+        }
+        else{
+            item.unitName = info.unitName;
+            item.memberCategory = changeEnumValue(UNITMEMBERTYPE, item.unitMemberType);//会员类别/级别
         }
-        let item:any = extractData(info, selectConf);
-
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
-        item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
-        if(item.individualMemberType) item.individualMemberType = changeEnumValue(INDIVIDUALMEMBERTYPE, item.individualMemberType);
-        if(item.unitMemberType) item.unitMemberType = changeEnumValue(UNITMEMBERTYPE, item.unitMemberType);
-        
+        item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);//会员等级、职务
+
         dataList.push(item);
     });
 
@@ -55,30 +58,41 @@ import { changeEnumValue } from "../../util/verificationEnum";
 
 
 /**
- * 变更权限
+ * 变更权限  success
  * @param param0 
  */
 export async function updateAuthority({form, userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
-    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-    await updateOneData(TABLEENUM.用户表, {userId}, form);
+    let {memberLevel, memberCategory} = form;
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let updateInfo:any = {};
+    eccEnumValue("变更权限", "职务、级别", MEMBERLEVEL, memberLevel);
+    updateInfo.memberLevel = memberLevel;
+    if (userInfo.memberType == MEMBERTYPE.个人会员) {
+        eccEnumValue("变更权限", "单位、个人会员类别、级别", INDIVIDUALMEMBERTYPE, memberCategory);
+        updateInfo.individualMemberType = memberCategory;
+    } else {
+        eccEnumValue("变更权限", "单位、个人会员类别、级别", UNITMEMBERTYPE, memberCategory);
+        updateInfo.unitMemberType = memberCategory;
+    }
+
+    await updateOneData(TABLEENUM.用户表, {userId}, updateInfo);
 
     return successResult();
-
 }
 
 
 /**
- * 冻结
+ * 冻结 success
  * @param param0 
  */
 export async function freeze({userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
-    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     await updateOneData(TABLEENUM.用户表, {userId}, {memberState:MEMBERSTATE.冻结});
 
     return successResult();
-
 }
 
 

src/biz/member/user.ts

@@ -2,7 +2,7 @@
  * 用户逻辑
  */
 
-import { DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, PROFCATEGORY, SEX, UNITINFOTYPE } from "../../config/enum";
+import { DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, PROFCATEGORY, SEX, STATE, UNITINFOTYPE } from "../../config/enum";
 import { ERRORCODEENUM, ERRORENUM } from "../../config/errorEnum";
 import { addOneData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -19,8 +19,9 @@ import { eccEnumValue } from "../../util/verificationEnum";
  * @param param0 
  * @returns 
  */
-export async function login({loginId, pwd }) {
-    let userInfo = await findOnce(TABLEENUM.用户表, {loginId});
+export async function login({loginStr, pwd}) {
+    let selectParam = { "$or":[{loginId:loginStr}, {phone:loginStr}] };
+    let userInfo = await findOnce(TABLEENUM.用户表, selectParam);
     
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.账号或密码错误);
     if (userInfo.pwd != pwd ) throw new BizError(ERRORENUM.账号或密码错误);
@@ -28,14 +29,14 @@ export async function login({loginId, pwd }) {
     let token = generateToken(userInfo.userId);
     await updateOneData(TABLEENUM.用户表, {userId:userInfo.userId}, {token, tokenMs:new Date().valueOf()});
 
-    return {
-        userInfo:{
-            isAdmin:userInfo.isAdmin == 1,
-            name:userInfo.name,
-            userId:userInfo.userId,
-            token:token
-        }
-    }
+    let dataInfo = {
+        isAdmin:userInfo.isAdmin == STATE.是,
+        name:userInfo.name,
+        userId:userInfo.userId,
+        token:token
+    };
+
+    return {dataInfo}
 }
 
 

src/config/enum.ts

@@ -336,6 +336,17 @@ export enum INDIVIDUALMEMBERTYPE {
     个人会员专家,
 }
 
+/**
+ * 会员类型 校验用
+ */
+export enum MEMBERTYPEECCENUM {
+    个人会员 = 1,
+    个人会员专家,
+    单位会员院校 = 9,
+    单位会员机构,
+    单位会员其他
+}
+
 
 /**
  * 会员等级 会员职务

src/routers/member/router.ts

@@ -466,8 +466,8 @@ export const Config = {
                 {
                     key:"form", type:"Object", sub:
                     {
-                        memberLevel:{type:'Number', desc:'职务', notMustHave:false},
-                        memberCategory:{type:'Number', desc:'单位、个人会员类别', notMustHave:false},
+                        memberLevel:{type:'Number', desc:'等级、职务'},
+                        memberCategory:{type:'Number', desc:'单位、个人会员类别、级别'},
                     }
                 },
                 {