Browse Source

新增项目名字重复判断

olym 7 years ago
parent
commit
7e85d4f0e3
2 changed files with 5 additions and 6 deletions
  1. 2 2
      modules/pm/controllers/pm_controller.js
  2. 3 4
      modules/pm/models/project_model.js

+ 2 - 2
modules/pm/controllers/pm_controller.js

@@ -45,9 +45,9 @@ module.exports = {
             }
         });
     },
-    updateProjects: function (req, res) {
+    updateProjects: async function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.updateUserProjects(req.session.sessionUser.ssoId, data.updateData, function (err, message, data) {
+        await ProjectsData.updateUserProjects(req.session.sessionUser.ssoId, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {

+ 3 - 4
modules/pm/models/project_model.js

@@ -36,7 +36,7 @@ ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
     });
 }
 
-ProjectsDAO.prototype.updateUserProjects = function(userId, datas, callback){
+ProjectsDAO.prototype.updateUserProjects = async function(userId, datas, callback){
     let data, project, updateLength = 0, hasError = false, deleteInfo = null, i, newProject;
     let updateAll = function (err) {
             if (!err){
@@ -61,7 +61,7 @@ ProjectsDAO.prototype.updateUserProjects = function(userId, datas, callback){
                 data.updateData['createDateTime'] = new Date();
                 newProject = new Projects(data.updateData);
                 // 查找同级是否存在同名数据
-                let exist = this.isExist(data.updateData.name, data.updateData.ParentID);
+                let exist = await this.isExist(data.updateData.name, data.updateData.ParentID);
                 if (exist) {
                     callback(1, '同级目录已存在相同名称数据.', null);
                     return;
@@ -191,10 +191,9 @@ ProjectsDAO.prototype.getProjectProperty = async function(id) {
  */
 ProjectsDAO.prototype.isExist = async function(name, parentID) {
     parentID = parseInt(parentID);
-    if (name === '' || isNaN(parentID) || parentID <= 0) {
+    if (name === '' || isNaN(parentID)) {
         return true;
     }
-
     let count = await Projects.count({ParentID: parentID, name: name});
 
     return count > 0;