Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/java/com/gavel/kwell/dao/impl/UpointDaoImpl.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 @Repository("upointDao")
 public class UpointDaoImpl extends BaseDaoImpl implements UpointDao {
-	
+
 	public RecordSet<UpointVO> query(UpointCondition condition){
 		SqlMap sqlMap = new SqlMap();
         sqlMap.setPageNo(condition.getPageNo());
@@ -29,7 +29,7 @@ public class UpointDaoImpl extends BaseDaoImpl implements UpointDao {
         if (StringUtils.isNotEmpty(condition.getId())){
             sqlMap.append("  and " + SqlUtil.getWhereSql("U_PLCPOINT_ID", condition.getId()));
             sqlMap.setParamValue("U_PLCPOINT_ID", condition.getId());
-            
+
         }
 
         if (StringUtils.isNotEmpty(condition.getType())){
@@ -82,7 +82,7 @@ public class UpointDaoImpl extends BaseDaoImpl implements UpointDao {
         sqlMap.append("from U_PLCPOINT ");
         sqlMap.append("where U_PLCPOINT_TYPE = :U_PLCPOINT_TYPE ");
         sqlMap.setParamValue("U_PLCPOINT_TYPE", type);
-        sqlMap.append("order by U_PLCPOINT_CODE ");
+        sqlMap.append("order by U_PLCPOINT_NAME ");
         return sqlMap.query(Upoint.class);
     }
 }